Merge branch '2.6.x' into 2.7.x

snicoll · snicoll · commit 245e602ae058 · 2022-04-07T09:18:17.000+02:00
Closes gh-30573
diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -48,6 +48,12 @@
         "sun.java.command"
       ]
     },
+    {
+      "name": "management.endpoint.health.probes.add-additional-paths",
+      "type": "java.lang.Boolean",
+      "description": "Whether to make the liveness and readiness health groups available on the main server port.",
+      "defaultValue": false
+    },
     {
       "name": "management.endpoint.health.probes.enabled",
       "type": "java.lang.Boolean",

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,12 @@`
`48`	`48`	`"sun.java.command"`
`49`	`49`	`]`
`50`	`50`	`},`
	`51`	`+ {`
	`52`	`+ "name": "management.endpoint.health.probes.add-additional-paths",`
	`53`	`+ "type": "java.lang.Boolean",`
	`54`	`+ "description": "Whether to make the liveness and readiness health groups available on the main server port.",`
	`55`	`+ "defaultValue": false`
	`56`	`+ },`
`51`	`57`	`{`
`52`	`58`	`"name": "management.endpoint.health.probes.enabled",`
`53`	`59`	`"type": "java.lang.Boolean",`