Merge branch '1.4.x' into 1.5.x

spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -215,18 +215,6 @@
       "replacement": "spring.info.git.location"
     }
   },
-  {
-    "name": "spring.pid.file",
-    "type": "java.lang.String",
-    "description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
-    "sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter"
-  },
-  {
-    "name": "spring.pid.fail-on-write-error",
-    "type": "java.lang.Boolean",
-    "description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.",
-    "sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter"
-  },
   {
     "name": "spring.pidfile",
     "type": "java.lang.String",

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -123,7 +123,7 @@ content into your application; rather pick only the properties that you need.
 	# OUTPUT
 	spring.output.ansi.enabled=detect # Configure the ANSI output.
 
-	# PID FILE ({sc-spring-boot-actuator}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter])
+	# PID FILE ({sc-spring-boot}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter])
 	spring.pid.fail-on-write-error= # Fail if ApplicationPidFileWriter is used but it cannot write the PID file.
 	spring.pid.file= # Location of the PID file to write (if ApplicationPidFileWriter is used).
 

spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -1550,7 +1550,7 @@ writes a PID file. Example:
 [indent=0]
 ----
 	org.springframework.context.ApplicationListener=\
-	org.springframework.boot.actuate.system.ApplicationPidFileWriter,\
+	org.springframework.boot.system.ApplicationPidFileWriter,\
 	org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter
 ----
 

spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -182,6 +182,18 @@
     "description": "Configure the ANSI output.",
     "defaultValue": "detect"
   },
+  {
+    "name": "spring.pid.file",
+    "type": "java.lang.String",
+    "description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
+    "sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
+  },
+  {
+    "name": "spring.pid.fail-on-write-error",
+    "type": "java.lang.Boolean",
+    "description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.",
+    "sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
+  },
   {
     "name": "spring.profiles.active",
     "type": "java.util.List<java.lang.String>",