Merge branch 'spring-projects:main' into main

Author: pdalfarr

.github/dco.yml

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

.github/workflows/ci-boot.yml

@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         java: [ 17 ]
-        boot: [ 3.1.10, 3.2.0, 3.2.1, 3.2.2, 3.2.3 ]
+        boot: [ 3.3.6, 3.4.0 ]
       fail-fast: false
 
     steps:
@@ -43,7 +43,7 @@ jobs:
           */*/build/reports
     - name: Upload Build Logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v4.4.3
       with:
         name: buildlogs-${{ matrix.boot }}-${{ matrix.java }}
         path: build/buildlogs.tar.gz

.github/workflows/ci.yml

@@ -12,23 +12,18 @@ jobs:
 
   # build and test, then upload logs if failure
   build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        java: [ 17 ]
-      fail-fast: false
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v4.2.2
     - name: Setup JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v4.7.0
       with:
         distribution: adopt
-        java-version: ${{ matrix.java }}
+        java-version: 17
         cache: gradle
     - name: Build with Gradle
-      run: ./gradlew clean build
+      run: ./gradlew build
       env:
         GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
         GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
@@ -45,7 +40,7 @@ jobs:
           */*/build/reports
     - name: Upload Build Logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4.6.0
       with:
         name: buildlogs
         path: build/buildlogs.tar.gz
@@ -55,15 +50,15 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v4
+    - uses: actions/checkout@v4.2.2
+    - uses: actions/setup-java@v4.7.0
       with:
         distribution: adopt
         java-version: 17
         cache: gradle
-    - uses: jfrog/setup-jfrog-cli@v4
+    - uses: jfrog/setup-jfrog-cli@v4.5.6
       with:
-        version: 2.52.10
+        version: 2.73.2
       env:
         JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
 
@@ -72,6 +67,8 @@ jobs:
     # modify default build name and number as we don't like how those
     # gets used from action defaults.
     - name: Configure JFrog Cli
+      env:
+        JFROG_CLI_SERVER_ID: "repo.spring.io"
       run: |
         jf gradlec \
           --use-wrapper \

.github/workflows/mongodb.yml

@@ -44,7 +44,7 @@ jobs:
         tar -zc --ignore-failed-read --file build/buildlogs.tar.gz */build/reports */*/build/reports
     - name: Upload Build Logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v4.4.3
       with:
         name: buildlogs
         path: build/buildlogs.tar.gz

.github/workflows/pr.yml

@@ -36,7 +36,7 @@ jobs:
           */*/build/reports
     - name: Upload Build Logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4.4.3
       with:
         name: buildlogs
         path: build/buildlogs.tar.gz

.github/workflows/redis.yml

@@ -44,7 +44,7 @@ jobs:
         tar -zc --ignore-failed-read --file build/buildlogs.tar.gz */build/reports */*/build/reports
     - name: Upload Build Logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v4.4.3
       with:
         name: buildlogs
         path: build/buildlogs.tar.gz

.github/workflows/smoke.yml

@@ -38,7 +38,7 @@ jobs:
         tar -zc --ignore-failed-read --file build/buildlogs.tar.gz */build/reports */*/build/reports
     - name: Upload Build Logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v4.4.3
       with:
         name: buildlogs
         path: build/buildlogs.tar.gz

CONTRIBUTING.md

@@ -34,11 +34,11 @@ Is there already an issue that addresses your concern? Do a bit of searching in
 # Discuss non-trivial contribution ideas with committers
 If you are considering anything more than correcting a typo or fixing a minor bug , please discuss it on the GitHub issues. We are happy to provide guidance but please spend an hour or two researching the subject on your own including searching the forums for prior discussions.
 
-# Sign the Contributor License Agreement
-If you have not previously done so, please fill out and submit the [Pivotal CLA form](https://cla.pivotal.io).
-When you've completed the web form, that's it and your ready for pull request.
+# Sign-off commits according to the Developer Certificate of Origin
 
-When issuing a new pull reques, our bot also verifies that you have signed a CLA. Bot will ask you to sign it if it doesn't exist.
+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).
 
 # Create your branch from master
 Create your topic branch to be submitted as a pull request from master. The Spring team will consider your pull request for backporting on a case-by-case basis; you don't need to worry about submitting anything for backporting.

buildSrc/build.gradle

@@ -10,8 +10,9 @@ java {
 repositories {
 	gradlePluginPortal()
 	mavenCentral()
-	maven { url 'https://repo.spring.io/plugins-release/' }
+	maven { url "https://repo.spring.io/milestone" }
 	maven { url "https://repo.spring.io/snapshot" }
+	maven { url 'https://repo.spring.io/plugins-release/' }
 }
 
 ext {

gradle.properties

@@ -1,21 +1,20 @@
-#Mon Jun 19 10:33:34 UTC 2023
 version=4.0.1-SNAPSHOT
-springBootVersion=3.1.10
+springBootVersion=3.5.0-SNAPSHOT
+springShellVersion=3.4.1-SNAPSHOT
+
 jakartaPersistenceVersion=3.1.0
-kryoVersion=4.0.2
-springCloudClusterVersion=1.0.2.RELEASE
-springShellVersion=1.1.0.RELEASE
-eclipseEmfXmiVersion=2.11.1-v20150805-0538
+kryoVersion=4.0.3
+eclipseEmfXmiVersion=2.11.1
 eclipseUml2CommonVersion=2.0.0-v20140602-0749
-eclipseEmfCommonVersion=2.11.0-v20150805-0538
+eclipseEmfCommonVersion=2.11.0
 eclipseUml2TypesVersion=2.0.0-v20140602-0749
-eclipseEmfEcoreVersion=2.11.1-v20150805-0538
+eclipseEmfEcoreVersion=2.11.2
 eclipseUml2UmlVersion=5.0.0-v20140602-0749
 xcuratorVersion=2.11.1
 curatorVersion=5.5.0
 springAsciidoctorBackends=0.0.5
 awaitilityVersion=3.1.6
-reactorBlockHoundVersion=1.0.4.RELEASE
+reactorBlockHoundVersion=1.0.10.RELEASE
 findbugsVersion=3.0.2
 gradleEnterpriseVersion=3.16.2
 springGeConventionsVersion=0.0.15