Merge branch '3.5.x'

wilkinsona · wilkinsona · commit ac2656d312b7 · 2025-07-02T11:25:20.000+01:00
Closes gh-46248
diff --git a/spring-boot-project/spring-boot-batch/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-batch/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -20,7 +20,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
`@@ -20,7 +20,7 @@`
`20`	`20`	`{`
`21`	`21`	`"name": "spring.batch.job.enabled",`
`22`	`22`	`"type": "java.lang.Boolean",`
`23`		`- "description": "Execute all Spring Batch jobs in the context on startup.",`
	`23`	`+ "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.",`
`24`	`24`	`"defaultValue": true`
`25`	`25`	`},`
`26`	`26`	`{`