Merge branch 'main' into GH-4826

# Conflicts:
#	spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java

Author: 조민국[해리][예약&주문플랫폼개발2]

.github/release-files-spec.json

@@ -0,0 +1,18 @@
+{
+  "files": [
+    {
+      "aql": {
+        "items.find": {
+          "$and": [
+            {
+              "@build.name": "${buildname}",
+              "@build.number": "${buildnumber}",
+              "path": { "$match": "org/springframework/batch/spring-batch-*" }
+            }
+          ]
+        }
+      },
+      "target": "nexus/"
+    }
+  ]
+}

.github/workflows/artifactory-milestone-release.yml

@@ -13,26 +13,32 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.2.2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.7.1
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: 'maven'
 
-      - name: Capture release version
-        run: echo RELEASE_VERSION=${{ github.event.inputs.releaseVersion }} >> $GITHUB_ENV
-
       - name: Update release version
-        run: mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$RELEASE_VERSION
+        run: mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.releaseVersion }}
 
       - name: Enforce release rules
         run: mvn org.apache.maven.plugins:maven-enforcer-plugin:enforce -Drules=requireReleaseDeps
 
-      - name: Build with Maven and deploy to Artifactory staging repository
-        env:
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-        run: mvn -P artifactory-staging -s settings.xml --batch-mode -Dmaven.test.skip=true deploy
+      - name: Build with Maven
+        run: mvn -DaltDeploymentRepository=local::file:deployment-repository --no-transfer-progress --batch-mode -Dmaven.test.skip=true deploy
+
+      - name: Deploy to Artifactory
+        uses: spring-io/artifactory-deploy-action@v0.0.2
+        with:
+          uri: 'https://repo.spring.io'
+          username: ${{ secrets.ARTIFACTORY_USERNAME }}
+          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          build-name: 'spring-batch-${{ github.event.inputs.releaseVersion }}'
+          repository: 'libs-staging-local'
+          folder: 'deployment-repository'
+          signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}

.github/workflows/artifactory-staging.yml

@@ -4,29 +4,34 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    name: Build branch
+    name: Build main branch
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.2.2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.7.1
         with:
           java-version: '17'
           distribution: 'temurin'
           cache: 'maven'
 
       - name: Build with Maven
-        if: ${{ github.repository != 'spring-projects/spring-batch' || github.ref_name != 'main' }}
-        run: mvn -s settings.xml --batch-mode --update-snapshots verify
+        run: mvn -DaltDeploymentRepository=local::file:deployment-repository --no-transfer-progress --batch-mode --update-snapshots deploy
 
-      - name: Build with Maven and deploy to Artifactory
+      - name: Deploy to Artifactory
         if: ${{ github.repository == 'spring-projects/spring-batch' && github.ref_name == 'main' }}
-        env:
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-        run: mvn -s settings.xml --batch-mode --update-snapshots deploy
+        uses: spring-io/artifactory-deploy-action@v0.0.2
+        with:
+          uri: 'https://repo.spring.io'
+          username: ${{ secrets.ARTIFACTORY_USERNAME }}
+          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          build-name: 'spring-batch-main'
+          repository: 'libs-snapshot-local'
+          folder: 'deployment-repository'
+          signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: Generate Java docs
         run: mvn javadoc:aggregate

.github/workflows/continuous-integration.yml

@@ -3,81 +3,30 @@ name: Maven Central Release
 on:
   workflow_dispatch:
     inputs:
-      releaseVersion:
-        description: "Release version"
+      buildName:
+        description: "Artifactory build name"
+        required: true
+      buildNumber:
+        description: "Artifactory build number"
         required: true
 
 jobs:
-  build:
+
+  release:
     runs-on: ubuntu-latest
     steps:
-
-      - name: Capture release version
-        run: echo RELEASE_VERSION=${{ github.event.inputs.releaseVersion }} >> $GITHUB_ENV
-
-      - name: Prepare directory structure
-        run: |
-          mkdir -p nexus/org/springframework/batch/spring-batch-bom/$RELEASE_VERSION
-          mkdir -p nexus/org/springframework/batch/spring-batch-infrastructure/$RELEASE_VERSION
-          mkdir -p nexus/org/springframework/batch/spring-batch-core/$RELEASE_VERSION
-          mkdir -p nexus/org/springframework/batch/spring-batch-test/$RELEASE_VERSION
-          mkdir -p nexus/org/springframework/batch/spring-batch-integration/$RELEASE_VERSION
-
-      - name: Download release files from Artifactory
+      - name: Checkout source code
+        uses: actions/checkout@v4.2.2
+      - name: Set Up JFrog CLI
+        uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
         env:
-          ARTIFACTORY_URL: "https://repo.spring.io/libs-staging-local/org/springframework/batch"
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-        run: |
-          echo "Downloading BOM artifacts"
-          cd nexus/org/springframework/batch/spring-batch-bom/$RELEASE_VERSION
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-bom/$RELEASE_VERSION/spring-batch-bom-$RELEASE_VERSION.pom
-          
-          echo "Downloading infrastructure artifacts"
-          cd ../../../../../..
-          cd nexus/org/springframework/batch/spring-batch-infrastructure/$RELEASE_VERSION
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-infrastructure/$RELEASE_VERSION/spring-batch-infrastructure-$RELEASE_VERSION.pom
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-infrastructure/$RELEASE_VERSION/spring-batch-infrastructure-$RELEASE_VERSION.jar
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-infrastructure/$RELEASE_VERSION/spring-batch-infrastructure-$RELEASE_VERSION-javadoc.jar
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-infrastructure/$RELEASE_VERSION/spring-batch-infrastructure-$RELEASE_VERSION-sources.jar
-
-          echo "Downloading core artifacts"
-          cd ../../../../../..
-          cd nexus/org/springframework/batch/spring-batch-core/$RELEASE_VERSION
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-core/$RELEASE_VERSION/spring-batch-core-$RELEASE_VERSION.pom
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-core/$RELEASE_VERSION/spring-batch-core-$RELEASE_VERSION.jar
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-core/$RELEASE_VERSION/spring-batch-core-$RELEASE_VERSION-javadoc.jar
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-core/$RELEASE_VERSION/spring-batch-core-$RELEASE_VERSION-sources.jar
-
-          echo "Downloading test artifacts"
-          cd ../../../../../..
-          cd nexus/org/springframework/batch/spring-batch-test/$RELEASE_VERSION
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-test/$RELEASE_VERSION/spring-batch-test-$RELEASE_VERSION.pom
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-test/$RELEASE_VERSION/spring-batch-test-$RELEASE_VERSION.jar
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-test/$RELEASE_VERSION/spring-batch-test-$RELEASE_VERSION-javadoc.jar
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-test/$RELEASE_VERSION/spring-batch-test-$RELEASE_VERSION-sources.jar
-
-          echo "Downloading integration artifacts"
-          cd ../../../../../..
-          cd nexus/org/springframework/batch/spring-batch-integration/$RELEASE_VERSION
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-integration/$RELEASE_VERSION/spring-batch-integration-$RELEASE_VERSION.pom
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-integration/$RELEASE_VERSION/spring-batch-integration-$RELEASE_VERSION.jar
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-integration/$RELEASE_VERSION/spring-batch-integration-$RELEASE_VERSION-javadoc.jar
-          wget --user="$ARTIFACTORY_USERNAME" --password="$ARTIFACTORY_PASSWORD" $ARTIFACTORY_URL/spring-batch-integration/$RELEASE_VERSION/spring-batch-integration-$RELEASE_VERSION-sources.jar
-
-      - name: Sign artifacts and release them to Maven Central
-        uses: jvalkeal/nexus-sync@v0
-        id: nexus
+          JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
+      - name: Download Release Artifacts
+        shell: bash
+        run: jf rt download --spec .github/release-files-spec.json --spec-vars 'buildname=${{ github.event.inputs.buildName }};buildnumber=${{ github.event.inputs.buildNumber }}'
+      - name: Sync to Maven Central
+        uses: spring-io/central-publish-action@0cdd90d12e6876341e82860d951e1bcddc1e51b6 # v0.2.0
         with:
-          url: ${{ secrets.OSSRH_URL }}
-          username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
-          password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
-          staging-profile-name: ${{ secrets.OSSRH_STAGING_PROFILE_NAME }}
-          create: true
-          upload: true
-          close: true
-          release: true
-          generate-checksums: true
-          pgp-sign: true
-          pgp-sign-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          pgp-sign-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          token-name: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
+          token: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
+          timeout: 60m

.github/workflows/maven-central-release.yml

@@ -12,7 +12,8 @@ derbydb
 derby.log
 com.springsource.sts.config.flow.prefs
 s3.properties
-.idea
+.idea/*
+!/.idea/icon.svg
 *.iml
 *.ipr
 *.iws

.gitignore

@@ -1,18 +1,15 @@
 # Latest news
 
-* March 19, 2025: [Spring Batch 5.2.2 available now](https://spring.io/blog/2025/03/19/spring-batch-5-2-2-available-now) 
-* 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)
+* September 17, 2025: [Spring Batch 6.0.0 M3 and 5.2.3 available now](https://spring.io/blog/2025/09/17/spring-batch-6-0-0-m3-5-2-3-released)
+* August 20, 2025: [Spring Batch 6.0.0 M2 available now](https://spring.io/blog/2025/08/20/spring-batch-6) 
+* July 23, 2025: [Spring Batch 6.0.0 M1 is out!](https://spring.io/blog/2025/07/23/spring-batch-6) 
 
 <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)
 
 Spring Batch is a lightweight, comprehensive batch framework designed to enable the development of robust batch applications vital for the daily operations of enterprise systems.  Spring Batch builds upon the productivity, POJO-based development approach, and general ease of use capabilities people have come to know from the [Spring Framework](https://github.com/spring-projects/spring-framework), while making it easy for developers to access and leverage more advanced enterprise services when necessary.
 
-If you are looking for a runtime orchestration tool for your Batch applications, or need a management console to view current and historic executions, take a look at [Spring Cloud Data Flow](https://cloud.spring.io/spring-cloud-dataflow/).  It is an orchestration tool for deploying and executing data integration based microservices including Spring Batch applications.
-
 # Getting Started
 
 ## Two minutes tutorial
@@ -221,8 +218,6 @@ We welcome contributions in any kind! Here are some ways for you to contribute t
 * Github is for social coding: if you want to write code, we encourage contributions through pull requests. If you want to contribute code this way, please familiarize yourself with the process outlined here: [Contributor Guidelines](https://github.com/spring-projects/spring-batch/blob/main/CONTRIBUTING.md).
 * Watch for Spring Batch related articles on [spring.io](https://spring.io).
 
-Before we accept pull requests, we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup).  Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do.  Active contributors might be asked to join the core team, and given the ability to merge pull requests.
-
 # Code of Conduct
 
 Please see our [code of conduct](https://github.com/spring-projects/.github/blob/main/CODE_OF_CONDUCT.md).