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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/EndSmokeTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2024 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,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -33,6 +34,7 @@
 
 public class EndSmokeTests extends AbstractBuildTests {
 
+	@Disabled("This test fails intermittently") // FIXME check and fix intermittent failure
 	@Test
 	@SuppressWarnings("unchecked")
 	public void testEndState() throws Exception {

spring-statemachine-core/src/test/java/org/springframework/statemachine/action/StateDoActivityActionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2020 the original author or authors.
+ * Copyright 2016-2024 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.
@@ -22,6 +22,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -291,6 +292,7 @@ public void testStateDoActionCancelledWithConfigSetting() throws Exception {
 		assertThat(testActionS2.interruptedLatch.await(2, TimeUnit.SECONDS)).isTrue();
 	}
 
+	@Disabled("This test fails intermittently") // FIXME check and fix intermittent failure
 	@Test
 	public void testStateDoActionNotCancelledWithConfigTimeout() throws Exception {
 		context.register(Config6.class);

spring-statemachine-platform/build.gradle

@@ -12,7 +12,7 @@ dependencies {
 		api "log4j:log4j:$log4jVersion"
         api "jakarta.persistence:jakarta.persistence-api:$jakartaPersistenceVersion"
 		api "com.esotericsoftware:kryo-shaded:$kryoVersion"
-		api "org.springframework.shell:spring-shell:$springShellVersion"
+		api "org.springframework.shell:spring-shell-core:$springShellVersion"
 		api "org.eclipse.uml2:uml:$eclipseUml2UmlVersion"
 		api "org.eclipse.uml2:types:$eclipseUml2TypesVersion"
 		api "org.eclipse.uml2:common:$eclipseUml2CommonVersion"

spring-statemachine-platform/spring-statemachine-platform.gradle

@@ -13,7 +13,7 @@ dependencies {
 	constraints {
 		api "com.google.code.findbugs:jsr305:$findbugsVersion"
 		api "com.esotericsoftware:kryo-shaded:$kryoVersion"
-		api "org.springframework.shell:spring-shell:$springShellVersion"
+		api "org.springframework.shell:spring-shell-core:$springShellVersion"
 		api "jakarta.persistence:jakarta.persistence-api:$jakartaPersistenceVersion"
 		api "org.eclipse.uml2:uml:$eclipseUml2UmlVersion"
 		api "org.eclipse.uml2:types:$eclipseUml2TypesVersion"

spring-statemachine-samples/cdplayer/spring-statemachine-samples-cdplayer.gradle

@@ -8,7 +8,7 @@ dependencies {
 	management platform(project(":spring-statemachine-platform"))
 	implementation project(':spring-statemachine-samples-common')
 	implementation project(':spring-statemachine-core')
-	implementation 'org.springframework.shell:spring-shell'
+	implementation 'org.springframework.shell:spring-shell-core'
 	testImplementation(testFixtures(project(':spring-statemachine-core')))
 	testImplementation 'io.projectreactor:reactor-test'
 	testImplementation 'org.assertj:assertj-core'

spring-statemachine-samples/cdplayer/src/main/java/demo/cdplayer/Application.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-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.
@@ -21,10 +21,10 @@
 import java.lang.annotation.Target;
 import java.util.Map;
 
+import org.springframework.boot.SpringApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.support.MessageBuilder;
-import org.springframework.shell.Bootstrap;
 import org.springframework.statemachine.ExtendedState;
 import org.springframework.statemachine.StateContext;
 import org.springframework.statemachine.action.Action;
@@ -308,8 +308,8 @@ public void execute(StateContext<States, Events> context) {
 	}
 //end::snippetL[]
 
-	public static void main(String[] args) throws Exception {
-		Bootstrap.main(args);
+	public static void main(String[] args) {
+		SpringApplication.run(Application.class, args);
 	}
 
 }

spring-statemachine-samples/cdplayer/src/main/java/demo/cdplayer/CdPlayerCommands.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-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.
@@ -19,26 +19,24 @@
 import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.shell.core.CommandMarker;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-import org.springframework.stereotype.Component;
+import org.springframework.shell.command.annotation.Command;
+import org.springframework.shell.command.annotation.Option;
 
-@Component
-public class CdPlayerCommands implements CommandMarker {
+@Command
+public class CdPlayerCommands {
 
 	@Autowired
 	private CdPlayer cdPlayer;
 
 	@Autowired
 	private Library library;
 
-	@CliCommand(value = "cd lcd", help = "Prints CD player lcd info")
+	@Command(command = "cd lcd", description = "Prints CD player lcd info")
 	public String lcd() {
 		return cdPlayer.getLdcStatus();
 	}
 
-	@CliCommand(value = "cd library", help = "List user CD library")
+	@Command(command = "cd library", description = "List user CD library")
 	public String library() {
 		SimpleDateFormat format = new SimpleDateFormat("mm:ss");
 		StringBuilder buf = new StringBuilder();
@@ -53,8 +51,8 @@ public String library() {
 		return buf.toString();
 	}
 
-	@CliCommand(value = "cd load", help = "Load CD into player")
-	public String load(@CliOption(key = {"", "index"}) int index) {
+	@Command(command = "cd load", description = "Load CD into player")
+	public String load(@Option(longNames = {"", "index"}) int index) {
 		StringBuilder buf = new StringBuilder();
 		try {
 			Cd cd = library.getCollection().get(index);
@@ -66,32 +64,32 @@ public String load(@CliOption(key = {"", "index"}) int index) {
 		return buf.toString();
 	}
 
-	@CliCommand(value = "cd play", help = "Press player play button")
+	@Command(command = "cd play", description = "Press player play button")
 	public void play() {
 		cdPlayer.play();
 	}
 
-	@CliCommand(value = "cd stop", help = "Press player stop button")
+	@Command(command = "cd stop", description = "Press player stop button")
 	public void stop() {
 		cdPlayer.stop();
 	}
 
-	@CliCommand(value = "cd pause", help = "Press player pause button")
+	@Command(command = "cd pause", description = "Press player pause button")
 	public void pause() {
 		cdPlayer.pause();
 	}
 
-	@CliCommand(value = "cd eject", help = "Press player eject button")
+	@Command(command = "cd eject", description = "Press player eject button")
 	public void eject() {
 		cdPlayer.eject();
 	}
 
-	@CliCommand(value = "cd forward", help = "Press player forward button")
+	@Command(command = "cd forward", description = "Press player forward button")
 	public void forward() {
 		cdPlayer.forward();
 	}
 
-	@CliCommand(value = "cd back", help = "Press player back button")
+	@Command(command = "cd back", description = "Press player back button")
 	public void back() {
 		cdPlayer.back();
 	}