Merge branch '3.4.x' into 3.5.x

wilkinsona · wilkinsona · commit 1b7244b983a6 · 2025-07-02T11:22:40.000+01:00
Closes gh-46247
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -492,7 +492,7 @@
     {
       "name": "spring.batch.job.enabled",
       "type": "java.lang.Boolean",
-      "description": "Execute all Spring Batch jobs in the context on startup.",
+      "description": "Whether to execute a Spring Batch job on startup. When multiple jobs are present in the context, set spring.batch.job.name to identify the job to execute.",
       "defaultValue": true
     },
     {

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@`
`492`	`492`	`{`
`493`	`493`	`"name": "spring.batch.job.enabled",`
`494`	`494`	`"type": "java.lang.Boolean",`
`495`		`- "description": "Execute all Spring Batch jobs in the context on startup.",`
	`495`	`+ "description": "Whether to execute a Spring Batch job on startup. When multiple jobs are present in the context, set spring.batch.job.name to identify the job to execute.",`
`496`	`496`	`"defaultValue": true`
`497`	`497`	`},`
`498`	`498`	`{`