Step names must be unique #3757

.github/dco.yml

@@ -0,0 +1,2 @@
+require:
+  members: false

.github/workflows/continuous-integration.yml

@@ -1,6 +1,7 @@
 name: CI/CD build
 
 on:
+  workflow_dispatch:
   push:
     branches: [ "main" ]
 
@@ -53,5 +54,5 @@ jobs:
         working-directory: spring-batch-docs/target
         run: |
           unzip spring-batch-$PROJECT_VERSION-javadocs.zip
-          ssh -i $HOME/.ssh/key $DOCS_USERNAME@$DOCS_HOST cd $DOCS_PATH && mkdir -p $PROJECT_VERSION/api
-          scp -i $HOME/.ssh/key -r api $DOCS_USERNAME@$DOCS_HOST:$DOCS_PATH/$PROJECT_VERSION/api
+          ssh -i $HOME/.ssh/key $DOCS_USERNAME@$DOCS_HOST "cd $DOCS_PATH && mkdir -p $PROJECT_VERSION"
+          scp -i $HOME/.ssh/key -r api $DOCS_USERNAME@$DOCS_HOST:$DOCS_PATH/$PROJECT_VERSION

.github/workflows/documentation-upload.yml

@@ -55,8 +55,8 @@ jobs:
         working-directory: spring-batch-docs/target
         run: |
           unzip spring-batch-$RELEASE_VERSION-javadocs.zip
-          ssh -i $HOME/.ssh/key $DOCS_USERNAME@$DOCS_HOST cd $DOCS_PATH && mkdir -p $RELEASE_VERSION/api
-          scp -i $HOME/.ssh/key -r api $DOCS_USERNAME@$DOCS_HOST:$DOCS_PATH/$RELEASE_VERSION/api
+          ssh -i $HOME/.ssh/key $DOCS_USERNAME@$DOCS_HOST "cd $DOCS_PATH && mkdir -p $RELEASE_VERSION"
+          scp -i $HOME/.ssh/key -r api $DOCS_USERNAME@$DOCS_HOST:$DOCS_PATH/$RELEASE_VERSION
 
           unzip spring-batch-$RELEASE_VERSION-schemas.zip
           scp -i $HOME/.ssh/key batch/*.xsd $DOCS_USERNAME@$DOCS_HOST:$BATCH_SCHEMA_PATH

CONTRIBUTING.md

@@ -26,9 +26,11 @@ about how to report issues.
 Not sure what a *pull request* is, or how to submit one? Take a look at the excellent [GitHub help documentation][] first.
 Please create a new issue *before* submitting a pull request unless the change is truly trivial, e.g. typo fixes, removing compiler warnings, etc.
 
-### Sign the contributor license agreement
+### Sign-off commits according to the Developer Certificate of Origin
 
-If you have not previously done so, please fill out and submit the [Contributor License Agreement](https://cla.pivotal.io/sign/spring).
+All commits must include a Signed-off-by trailer at the end of each commit message to indicate that the contributor agrees to the [Developer Certificate of Origin](https://developercertificate.org).
+
+For additional details, please refer to the blog post [Hello DCO, Goodbye CLA: Simplifying Contributions to Spring](https://spring.io/blog/2025/01/06/hello-dco-goodbye-cla-simplifying-contributions-to-spring).
 
 ### Fork the Repository
 

README.md

@@ -1,3 +1,9 @@
+# Latest news
+
+* December 18, 2024: [Spring Batch 5.1.3 and 5.2.1 available now](https://spring.io/blog/2024/12/18/spring-batch-5-1-3-and-5-2-1-available-now) 
+* November 24, 2024: [Bootiful Spring Boot 3.4: Spring Batch](https://spring.io/blog/2024/11/24/bootiful-34-batch) 
+* November 20, 2024: [Spring Batch 5.2.0 goes GA!](https://spring.io/blog/2024/11/20/spring-batch-5-2-0-goes-ga)
+
 <img align="right" src="spring-batch-docs/modules/ROOT/assets/images/spring-batch.png" width="200" height="200">
 
 # Spring Batch [![build status](https://github.com/spring-projects/spring-batch/actions/workflows/continuous-integration.yml/badge.svg)](https://github.com/spring-projects/spring-batch/actions/workflows/continuous-integration.yml)
@@ -222,4 +228,4 @@ Please see our [code of conduct](https://github.com/spring-projects/.github/blob
 
 # License
 
-Spring Batch is Open Source software released under the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0.html).
+Spring Batch is Open Source software released under the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0.html).

pom.xml

@@ -8,7 +8,7 @@
 		designed to enable the development of robust batch applications vital
 		for the daily operations of enterprise systems. Spring Batch is part of
 		the Spring Portfolio.</description>
-	<version>5.2.0-SNAPSHOT</version>
+	<version>5.2.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<url>https://projects.spring.io/spring-batch</url>
 
@@ -61,98 +61,117 @@
 		<java.version>17</java.version>
 
 		<!-- production dependencies -->
-		<spring-framework.version>6.1.4-SNAPSHOT</spring-framework.version>
-		<spring-retry.version>2.0.5-SNAPSHOT</spring-retry.version>
-		<spring-integration.version>6.2.2-SNAPSHOT</spring-integration.version>
-		<micrometer.version>1.12.3-SNAPSHOT</micrometer.version>
+		<spring-framework.version>6.2.1</spring-framework.version>
+		<spring-retry.version>2.0.11</spring-retry.version>
+		<spring-integration.version>6.4.1</spring-integration.version>
+		<micrometer.version>1.14.2</micrometer.version>
 
 		<!-- optional production dependencies -->
-		<spring-data-commons.version>3.2.3-SNAPSHOT</spring-data-commons.version>
-		<spring-data-jpa.version>3.2.3-SNAPSHOT</spring-data-jpa.version>
-		<spring-data-redis.version>3.2.3-SNAPSHOT</spring-data-redis.version>
-		<spring-data-mongodb.version>4.2.3-SNAPSHOT</spring-data-mongodb.version>
-		<spring-kafka.version>3.1.2-SNAPSHOT</spring-kafka.version>
-		<spring-amqp.version>3.1.2-SNAPSHOT</spring-amqp.version>
-		<spring-ldap.version>3.2.2-SNAPSHOT</spring-ldap.version>
+		<spring-data-commons.version>3.4.1</spring-data-commons.version>
+		<spring-data-jpa.version>3.4.1</spring-data-jpa.version>
+		<spring-data-redis.version>3.4.1</spring-data-redis.version>
+		<spring-data-mongodb.version>4.4.1</spring-data-mongodb.version>
+		<spring-kafka.version>3.3.1</spring-kafka.version>
+		<spring-amqp.version>3.2.1</spring-amqp.version>
+		<spring-ldap.version>3.2.9</spring-ldap.version>
 
-		<jackson.version>2.15.3</jackson.version>
-		<avro.version>1.11.3</avro.version>
-		<gson.version>2.10.1</gson.version>
-		<hibernate-core.version>6.3.1.Final</hibernate-core.version>
-		<jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
-		<jakarta.mail-api.version>2.1.2</jakarta.mail-api.version>
+		<jackson.version>2.18.2</jackson.version>
+		<avro.version>1.12.0</avro.version>
+		<gson.version>2.11.0</gson.version>
+		<hibernate-core.version>6.6.3.Final</hibernate-core.version>
+		<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
+		<jakarta.mail-api.version>2.1.3</jakarta.mail-api.version>
 		<jakarta.jms-api.version>3.1.0</jakarta.jms-api.version>
-		<jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
+		<jakarta.validation-api.version>3.1.0</jakarta.validation-api.version>
 		<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
-		<neo4j-ogm-core.version>4.0.8</neo4j-ogm-core.version>
-		<mongodb-driver-sync.version>4.11.1</mongodb-driver-sync.version>
-		<junit-jupiter.version>5.10.1</junit-jupiter.version>
+		<neo4j-ogm-core.version>4.0.13</neo4j-ogm-core.version>
+		<mongodb-driver.version>5.2.1</mongodb-driver.version>
+		<junit-jupiter.version>5.11.4</junit-jupiter.version>
 
 		<!-- provided dependencies -->
 		<jsr305.version>3.0.2</jsr305.version>
 
 		<!-- test dependencies -->
-		<micrometer-tracing.version>1.2.3-SNAPSHOT</micrometer-tracing.version>
+		<micrometer-tracing.version>1.4.1</micrometer-tracing.version>
 
 		<xstream.version>1.4.20</xstream.version>
 		<junit.version>4.13.2</junit.version>
 		<junit-vintage-engine.version>${junit-jupiter.version}</junit-vintage-engine.version>
-		<hamcrest.version>2.2</hamcrest.version>
-		<assertj.version>3.24.2</assertj.version>
-		<mockito.version>5.7.0</mockito.version>
-		<xmlunit.version>2.9.1</xmlunit.version>
-		<commons-io.version>2.15.0</commons-io.version>
-		<commons-dbcp2.version>2.11.0</commons-dbcp2.version>
-		<slf4j.version>2.0.9</slf4j.version>
-		<hsqldb.version>2.7.2</hsqldb.version>
-		<h2.version>2.2.224</h2.version>
-		<sqlite.version>3.44.0.0</sqlite.version>
-		<derby.version>10.16.1.1</derby.version>
-		<hana.version>2.18.13</hana.version>
-		<artemis.version>2.31.2</artemis.version>
-		<jaxb-core.version>4.0.4</jaxb-core.version>
-		<log4j.version>2.22.0</log4j.version>
-		<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
-		<jakarta.el-api.version>5.0.1</jakarta.el-api.version>
+		<hamcrest.version>3.0</hamcrest.version>
+		<assertj.version>3.26.3</assertj.version>
+		<mockito.version>5.14.2</mockito.version>
+		<xmlunit.version>2.10.0</xmlunit.version>
+		<commons-io.version>2.18.0</commons-io.version>
+		<commons-dbcp2.version>2.13.0</commons-dbcp2.version>
+		<slf4j.version>2.0.16</slf4j.version>
+		<hsqldb.version>2.7.4</hsqldb.version>
+		<h2.version>2.3.232</h2.version>
+		<sqlite.version>3.47.1.0</sqlite.version>
+		<derby.version>10.16.1.1</derby.version> <!-- FIXME build failure with 10.17.1.0 -->
+		<hana.version>2.21.11</hana.version>
+		<artemis.version>2.38.0</artemis.version>
+		<jaxb-core.version>4.0.5</jaxb-core.version>
+		<log4j.version>2.24.3</log4j.version>
+		<hibernate-validator.version>8.0.2.Final</hibernate-validator.version>
+		<jakarta.el-api.version>6.0.1</jakarta.el-api.version>
 		<jakarta.el.version>4.0.2</jakarta.el.version>
 		<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
-		<jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version>
-		<angus-mail.version>2.0.2</angus-mail.version>
-		<woodstox-core.version>6.5.1</woodstox-core.version>
-		<aspectj.version>1.9.20.1</aspectj.version>
-		<mysql-connector-j.version>8.2.0</mysql-connector-j.version>
-		<mariadb-java-client.version>3.3.0</mariadb-java-client.version>
-		<postgresql.version>42.7.0</postgresql.version>
-		<db2.version>11.5.8.0</db2.version>
-		<oracle.version>19.21.0.0</oracle.version>
+		<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
+		<angus-mail.version>2.0.3</angus-mail.version>
+		<woodstox-core.version>7.1.0</woodstox-core.version>
+		<aspectj.version>1.9.22.1</aspectj.version>
+		<mysql-connector-j.version>9.1.0</mysql-connector-j.version>
+		<mariadb-java-client.version>3.5.1</mariadb-java-client.version>
+		<postgresql.version>42.7.4</postgresql.version>
+		<db2.version>11.5.9.0</db2.version>
+		<oracle.version>19.24.0.0</oracle.version>
 		<sqlserver.version>11.2.3.jre17</sqlserver.version>
 		<jtds.version>1.3.1</jtds.version>
-		<testcontainers.version>1.19.3</testcontainers.version>
-		<jsonassert.version>1.5.1</jsonassert.version>
+		<testcontainers.version>1.20.4</testcontainers.version>
+		<jsonassert.version>1.5.3</jsonassert.version>
 
 		<!-- samples dependencies -->
 		<spring-rabbit.version>${spring-amqp.version}</spring-rabbit.version>
 		<quartz.version>2.3.2</quartz.version>
 		<prometheus_pushgateway.version>0.16.0</prometheus_pushgateway.version>
-		<groovy.version>3.0.19</groovy.version>
+		<groovy.version>3.0.22</groovy.version>
 
 		<!-- documentation dependencies -->
 		<io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>
 
 		<!-- plugin versions -->
-		<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-		<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
-		<maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
-		<maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
-		<maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-		<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
-		<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
-		<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
-		<maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
-		<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+		<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+		<maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
+		<maven-failsafe-plugin.version>3.5.0</maven-failsafe-plugin.version>
+		<maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
+		<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+		<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
+		<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
+		<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
+		<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
 		<spring-javaformat-maven-plugin.version>0.0.39</spring-javaformat-maven-plugin.version>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>jcl-over-slf4j</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-api</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.slf4j</groupId>
+				<artifactId>slf4j-simple</artifactId>
+				<version>${slf4j.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -305,32 +324,6 @@
 	</build>
 
 	<profiles>
-		<profile>
-			<id>test-coverage</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>${jacoco-maven-plugin.version}</version>
-						<executions>
-							<execution>
-								<id>prepare-agent</id>
-								<goals>
-									<goal>prepare-agent</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>report</id>
-								<goals>
-									<goal>report</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<profile>
 			<id>artifactory-staging</id>
 			<distributionManagement>

spring-batch-bom/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.batch</groupId>
 		<artifactId>spring-batch</artifactId>
-		<version>5.2.0-SNAPSHOT</version>
+		<version>5.2.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-batch-bom</artifactId>
 	<packaging>pom</packaging>