Create spring-boot-batch module

Author: wilkinsona

settings.gradle

@@ -47,6 +47,7 @@ include "spring-boot-project:spring-boot-amqp"
 include "spring-boot-project:spring-boot-artemis"
 include "spring-boot-project:spring-boot-autoconfigure"
 include "spring-boot-project:spring-boot-autoconfigure-all"
+include "spring-boot-project:spring-boot-batch"
 include "spring-boot-project:spring-boot-data-jpa"
 include "spring-boot-project:spring-boot-dependencies"
 include "spring-boot-project:spring-boot-devtools"

spring-boot-project/spring-boot-autoconfigure-all/build.gradle

@@ -168,7 +168,6 @@ dependencies {
 	optional("org.springframework:spring-websocket")
 	optional("org.springframework:spring-webflux")
 	optional("org.springframework:spring-webmvc")
-	optional("org.springframework.batch:spring-batch-core")
 	optional("org.springframework.data:spring-data-couchbase")
 	optional("org.springframework.data:spring-data-envers") {
 		exclude group: "javax.activation", module: "javax.activation-api"

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

@@ -13,45 +13,6 @@
       "description": "Whether subclass-based (CGLIB) proxies are to be created (true), as opposed to standard Java interface-based proxies (false).",
       "defaultValue": true
     },
-   {
-      "name": "spring.batch.initialize-schema",
-      "type": "org.springframework.boot.sql.init.DatabaseInitializationMode",
-      "deprecation": {
-        "replacement": "spring.batch.jdbc.initialize-schema",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.batch.initializer.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Create the required batch tables on startup if necessary. Enabled automatically\n if no custom table prefix is set or if a custom schema is configured.",
-      "deprecation": {
-        "replacement": "spring.batch.jdbc.initialize-schema",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.batch.job.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Execute all Spring Batch jobs in the context on startup.",
-      "defaultValue": true
-    },
-    {
-      "name": "spring.batch.schema",
-      "type": "java.lang.String",
-      "deprecation": {
-        "replacement": "spring.batch.jdbc.schema",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.batch.table-prefix",
-      "type": "java.lang.String",
-      "deprecation": {
-        "replacement": "spring.batch.jdbc.table-prefix",
-        "level": "error"
-      }
-    },
     {
       "name": "spring.cassandra.compression",
       "defaultValue": "none"

spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/spring.factories

@@ -16,6 +16,5 @@ org.springframework.boot.autoconfigure.web.servlet.JspTemplateAvailabilityProvid
 
 # Depends on Database Initialization Detectors
 org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitializationDetector=\
-org.springframework.boot.autoconfigure.batch.JobRepositoryDependsOnDatabaseInitializationDetector,\
 org.springframework.boot.autoconfigure.quartz.SchedulerDependsOnDatabaseInitializationDetector,\
 org.springframework.boot.autoconfigure.session.JdbcIndexedSessionRepositoryDependsOnDatabaseInitializationDetector

spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,4 @@
 org.springframework.boot.autoconfigure.aop.AopAutoConfiguration
-org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration
 org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration
 org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration
 org.springframework.boot.autoconfigure.couchbase.CouchbaseAutoConfiguration

spring-boot-project/spring-boot-batch/build.gradle

@@ -0,0 +1,31 @@
+plugins {
+	id "java-library"
+	id "org.springframework.boot.auto-configuration"
+	id "org.springframework.boot.configuration-properties"
+	id "org.springframework.boot.deployed"
+	id "org.springframework.boot.optional-dependencies"
+}
+
+description = "Spring Boot Batch"
+
+dependencies {
+	api(project(":spring-boot-project:spring-boot"))
+	api(project(":spring-boot-project:spring-boot-jdbc"))
+	api("org.springframework.batch:spring-batch-core")
+
+	implementation(project(":spring-boot-project:spring-boot-tx"))
+
+	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+
+	testImplementation(project(":spring-boot-project:spring-boot-flyway"))
+	testImplementation(project(":spring-boot-project:spring-boot-jpa"))
+	testImplementation(project(":spring-boot-project:spring-boot-liquibase"))
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-autoconfigure")))
+
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+	testRuntimeOnly("com.fasterxml.jackson.core:jackson-databind")
+	testRuntimeOnly("com.h2database:h2")
+	testRuntimeOnly("com.zaxxer:HikariCP")
+}

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import java.util.List;
 
@@ -67,7 +67,7 @@
  * @author Lars Uffmann
  * @author Lasse Wulff
  * @author Yanming Zhou
- * @since 1.0.0
+ * @since 4.0.0
  */
 @AutoConfiguration(after = TransactionAutoConfiguration.class,
 		afterName = "org.springframework.boot.jpa.autoconfigure.hibernate.HibernateJpaAutoConfiguration")

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/BatchConversionServiceCustomizer.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchConversionServiceCustomizer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import org.springframework.batch.core.configuration.support.DefaultBatchConfiguration;
 import org.springframework.core.convert.support.ConfigurableConversionService;
@@ -26,7 +26,7 @@
  * DefaultBatchConfiguration} while retaining its default auto-configuration.
  *
  * @author Claudio Nave
- * @since 3.1.0
+ * @since 4.0.0
  */
 @FunctionalInterface
 public interface BatchConversionServiceCustomizer {

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSource.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchDataSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -31,7 +31,7 @@
  * {@link Primary @Primary}.
  *
  * @author Dmytro Nosan
- * @since 2.2.0
+ * @since 4.0.0
  */
 @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/BatchDataSourceScriptDatabaseInitializer.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchDataSourceScriptDatabaseInitializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import java.util.List;
 
@@ -33,7 +33,7 @@
  * @author Vedran Pavic
  * @author Andy Wilkinson
  * @author Phillip Webb
- * @since 2.6.0
+ * @since 4.0.0
  */
 public class BatchDataSourceScriptDatabaseInitializer extends DataSourceScriptDatabaseInitializer {
 

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.sql.init.DatabaseInitializationMode;
@@ -28,7 +28,7 @@
  * @author Vedran Pavic
  * @author Mukul Kumar Chaundhyan
  * @author Yanming Zhou
- * @since 1.2.0
+ * @since 4.0.0
  */
 @ConfigurationProperties("spring.batch")
 public class BatchProperties {

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/BatchTaskExecutor.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchTaskExecutor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -32,7 +32,7 @@
  * another one marked as {@link Primary @Primary}.
  *
  * @author Andy Wilkinson
- * @since 3.4.0
+ * @since 4.0.0
  */
 @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/BatchTransactionManager.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchTransactionManager.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -32,7 +32,7 @@
  * there is another one marked as {@link Primary @Primary}.
  *
  * @author Lasse Wulff
- * @since 3.3.0
+ * @since 4.0.0
  */
 @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE, ElementType.ANNOTATION_TYPE })
 @Retention(RetentionPolicy.RUNTIME)

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionEvent.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/JobExecutionEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import org.springframework.batch.core.JobExecution;
 import org.springframework.context.ApplicationEvent;
@@ -23,7 +23,7 @@
  * Spring {@link ApplicationEvent} encapsulating a {@link JobExecution}.
  *
  * @author Dave Syer
- * @since 1.0.0
+ * @since 4.0.0
  */
 @SuppressWarnings("serial")
 public class JobExecutionEvent extends ApplicationEvent {

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGenerator.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/JobExecutionExitCodeGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -27,7 +27,7 @@
  * {@link ExitCodeGenerator} for {@link JobExecutionEvent}s.
  *
  * @author Dave Syer
- * @since 1.0.0
+ * @since 4.0.0
  */
 public class JobExecutionExitCodeGenerator implements ApplicationListener<JobExecutionEvent>, ExitCodeGenerator {
 

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherApplicationRunner.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/JobLauncherApplicationRunner.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -64,7 +64,7 @@
  * @author Mahmoud Ben Hassine
  * @author Stephane Nicoll
  * @author Akshay Dubey
- * @since 2.3.0
+ * @since 4.0.0
  */
 public class JobLauncherApplicationRunner
 		implements ApplicationRunner, InitializingBean, Ordered, ApplicationEventPublisherAware {

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/JobRepositoryDependsOnDatabaseInitializationDetector.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/JobRepositoryDependsOnDatabaseInitializationDetector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;
 
 import java.util.Collections;
 import java.util.Set;

spring-boot-project/spring-boot-autoconfigure-all/src/main/java/org/springframework/boot/autoconfigure/batch/package-info.java renamed to spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,4 +17,4 @@
 /**
  * Auto-configuration for Spring Batch.
  */
-package org.springframework.boot.autoconfigure.batch;
+package org.springframework.boot.batch.autoconfigure;