Merge remote-tracking branch 'origin/main' into feature/spring-startup-roadmap

# Conflicts:
#	spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
#	spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

Author: aotemiao

.github/actions/build/action.yml

@@ -19,7 +19,7 @@ inputs:
   java-version:
     description: 'Java version to compile and test with'
     required: false
-    default: '24'
+    default: '25'
   publish:
     description: 'Whether to publish artifacts ready for deployment to Artifactory'
     required: false

.github/actions/prepare-gradle-build/action.yml

@@ -19,7 +19,7 @@ inputs:
   java-version:
     description: 'Java version to use for the build'
     required: false
-    default: '24'
+    default: '25'
 runs:
   using: composite
   steps:
@@ -30,7 +30,7 @@ runs:
         java-version: |
           ${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
           ${{ inputs.java-toolchain == 'true' && '17' || '' }}
-          24
+          25
     - name: Set Up Gradle
       uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
       with:

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
             toolchain: false
           - version: 21
             toolchain: true
-          - version: 24
+          - version: 25
             toolchain: true
         exclude:
           - os:

.github/workflows/update-antora-ui-spring.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        branch: [ '6.1.x' ]
+        branch: [ '6.2.x', 'main' ]
     steps:
       - uses: spring-io/spring-doc-actions/update-antora-spring-ui@5a57bcc6a0da2a1474136cf29571b277850432bc
         name: Update

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=24.0.2-librca
+java=25-librca

README.md

@@ -27,7 +27,7 @@ See the [Build from Source](https://github.com/spring-projects/spring-framework/
 
 ## Continuous Integration Builds
 
-Information regarding CI builds can be found in the [Spring Framework Concourse pipeline](ci/README.adoc) documentation.
+CI builds are defined with [GitHub Actions workflows](.github/workflows).
 
 ## Stay in Touch
 

build.gradle

@@ -4,9 +4,9 @@ plugins {
 	id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false
 	id 'org.jetbrains.dokka'
 	id 'com.github.bjornvester.xjc' version '1.8.2' apply false
-	id 'io.github.goooler.shadow' version '8.1.8' apply false
+	id 'com.gradleup.shadow' version "9.2.2" apply false
 	id 'me.champeau.jmh' version '0.7.2' apply false
-	id 'io.spring.nullability' version '0.0.4' apply false
+	id 'io.spring.nullability' version '0.0.8' apply false
 }
 
 ext {
@@ -69,23 +69,16 @@ configure([rootProject] + javaProjects) { project ->
 
 	ext.javadocLinks = [
 			"https://docs.oracle.com/en/java/javase/17/docs/api/",
-			"https://jakarta.ee/specifications/platform/11/apidocs/",
-			"https://docs.jboss.org/hibernate/orm/5.6/javadocs/",
+			//"https://jakarta.ee/specifications/platform/11/apidocs/",
+			"https://docs.hibernate.org/orm/5.6/javadocs/",
 			"https://www.quartz-scheduler.org/api/2.3.0/",
 			"https://hc.apache.org/httpcomponents-client-5.5.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			"https://docs.junit.org/5.13.4/api/",
+			"https://docs.junit.org/6.0.1/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
-			//"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
 			"https://r2dbc.io/spec/1.0.0.RELEASE/api/",
-			// Previously there could be a split-package issue between JSR250 and JSR305 javax.annotation packages,
-			// but since 6.0 JSR 250 annotations such as @Resource and @PostConstruct have been replaced by their
-			// JakartaEE equivalents in the jakarta.annotation package.
-			//"https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.2/",
-			"https://jspecify.dev/docs/api/",
-			"https://www.javadoc.io/doc/tools.jackson.core/jackson-databind/3.0.0-rc4/"
-
+			"https://jspecify.dev/docs/api/"
 	] as String[]
 }
 

buildSrc/build.gradle

@@ -20,8 +20,8 @@ ext {
 dependencies {
 	checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
 	implementation "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
-	implementation "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0"
-	implementation "com.tngtech.archunit:archunit:1.4.0"
+	implementation "org.jetbrains.dokka:dokka-gradle-plugin:2.1.0"
+	implementation "com.tngtech.archunit:archunit:1.4.1"
 	implementation "org.gradle:test-retry-gradle-plugin:1.6.2"
 	implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}"
 	implementation "io.spring.nohttp:nohttp-gradle:0.0.11"

buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java

@@ -50,7 +50,7 @@ public void apply(Project project) {
 			project.getPlugins().apply(CheckstylePlugin.class);
 			project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g"));
 			CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
-			checkstyle.setToolVersion("11.0.0");
+			checkstyle.setToolVersion("12.1.2");
 			checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 			String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 			DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();

buildSrc/src/main/java/org/springframework/build/JavaConventions.java

@@ -45,7 +45,7 @@ public class JavaConventions {
 	 * <p>NOTE: If you update this value, you should also update the value used in
 	 * the {@code javadoc} task in {@code framework-api.gradle}.
 	 */
-	private static final JavaLanguageVersion DEFAULT_LANGUAGE_VERSION = JavaLanguageVersion.of(24);
+	private static final JavaLanguageVersion DEFAULT_LANGUAGE_VERSION = JavaLanguageVersion.of(25);
 
 	/**
 	 * The Java version we should use as the baseline for the compiled bytecode