.github/actions/build/action.yml

@@ -19,7 +19,7 @@ inputs:
   java-version:
     description: 'Java version to compile and test with'
     required: false
-    default: '17'
+    default: '24'
   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: '17'
+    default: '24'
 runs:
   using: composite
   steps:
@@ -30,8 +30,9 @@ runs:
         java-version: |
           ${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
           ${{ inputs.java-toolchain == 'true' && '17' || '' }}
+          24
     - name: Set Up Gradle
-      uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+      uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
       with:
         cache-read-only: false
         develocity-access-key: ${{ inputs.develocity-access-key }}

.github/actions/sync-to-maven-central/action.yml

@@ -1,17 +1,14 @@
 name: Sync to Maven Central
 description: 'Syncs a release to Maven Central and waits for it to be available for use'
 inputs:
-  jfrog-cli-config-token:
-    description: 'Config token for the JFrog CLI'
-    required: true
-  ossrh-s01-staging-profile:
-    description: 'Staging profile to use when syncing to Central'
+  central-token-password:
+    description: 'Password for authentication with central.sonatype.com'
     required: true
-  ossrh-s01-token-password:
-    description: 'Password for authentication with s01.oss.sonatype.org'
+  central-token-username:
+    description: 'Username for authentication with central.sonatype.com'
     required: true
-  ossrh-s01-token-username:
-    description: 'Username for authentication with s01.oss.sonatype.org'
+  jfrog-cli-config-token:
+    description: 'Config token for the JFrog CLI'
     required: true
   spring-framework-version:
     description: 'Version of Spring Framework that is being synced to Central'
@@ -27,16 +24,10 @@ runs:
       shell: bash
       run: jf rt download --spec ${{ format('{0}/artifacts.spec', github.action_path) }} --spec-vars 'buildName=${{ format('spring-framework-{0}', inputs.spring-framework-version) }};buildNumber=${{ github.run_number }}'
     - name: Sync
-      uses: spring-io/nexus-sync-action@42477a2230a2f694f9eaa4643fa9e76b99b7ab84 # v0.0.1
+      uses: spring-io/central-publish-action@0cdd90d12e6876341e82860d951e1bcddc1e51b6 # v0.2.0
       with:
-        close: true
-        create: true
-        generate-checksums: true
-        password: ${{ inputs.ossrh-s01-token-password }}
-        release: true
-        staging-profile-name: ${{ inputs.ossrh-s01-staging-profile }}
-        upload: true
-        username: ${{ inputs.ossrh-s01-token-username }}
+        token: ${{ inputs.central-token-password }}
+        token-name: ${{ inputs.central-token-username }}
     - name: Await
       uses: ./.github/actions/await-http-resource
       with:

.github/workflows/ci.yml

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

.github/workflows/release-milestone.yml

@@ -61,10 +61,9 @@ jobs:
       - name: Sync to Maven Central
         uses: ./.github/actions/sync-to-maven-central
         with:
+          central-token-password: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
+          central-token-username: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
           jfrog-cli-config-token: ${{ secrets.JF_ARTIFACTORY_SPRING }}
-          ossrh-s01-staging-profile: ${{ secrets.OSSRH_S01_STAGING_PROFILE }}
-          ossrh-s01-token-password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
-          ossrh-s01-token-username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
           spring-framework-version: ${{ needs.build-and-stage-release.outputs.version }}
   promote-release:
     name: Promote Release

.github/workflows/release.yml

@@ -60,10 +60,9 @@ jobs:
       - name: Sync to Maven Central
         uses: ./.github/actions/sync-to-maven-central
         with:
+          central-token-password: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
+          central-token-username: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
           jfrog-cli-config-token: ${{ secrets.JF_ARTIFACTORY_SPRING }}
-          ossrh-s01-staging-profile: ${{ secrets.OSSRH_S01_STAGING_PROFILE }}
-          ossrh-s01-token-password: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
-          ossrh-s01-token-username: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
           spring-framework-version: ${{ needs.build-and-stage-release.outputs.version }}
   promote-release:
     name: Promote Release

.github/workflows/verify.yml

@@ -46,7 +46,7 @@ jobs:
           distribution: 'liberica'
           java-version: 17
       - name: Set Up Gradle
-        uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96 # v4.4.1
         with:
           cache-read-only: false
       - name: Configure Gradle Properties

.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-librca
+java=24.0.2-librca

build.gradle

@@ -2,11 +2,11 @@ plugins {
 	id 'io.freefair.aspectj' version '8.13.1' apply false
 	// kotlinVersion is managed in gradle.properties
 	id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false
-	id 'org.jetbrains.dokka' version '1.9.20'
+	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 'me.champeau.jmh' version '0.7.2' apply false
-	id "net.ltgt.errorprone" version "4.1.0" apply false
+	id "io.spring.nullability" version "0.0.1" apply false
 }
 
 ext {
@@ -57,30 +57,25 @@ configure([rootProject] + javaProjects) { project ->
 	apply from: "${rootDir}/gradle/ide.gradle"
 
 	dependencies {
-		testImplementation("org.junit.jupiter:junit-jupiter-api")
-		testImplementation("org.junit.jupiter:junit-jupiter-params")
-		testImplementation("org.junit.platform:junit-platform-suite-api")
+		testImplementation("org.junit.jupiter:junit-jupiter")
+		testImplementation("org.junit.platform:junit-platform-suite")
 		testImplementation("org.mockito:mockito-core")
 		testImplementation("org.mockito:mockito-junit-jupiter")
 		testImplementation("io.mockk:mockk")
 		testImplementation("org.assertj:assertj-core")
-		// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
-		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-		testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-core")
 	}
 
 	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://eclipse.dev/aspectj/doc/latest/runtime-api/",
 			"https://www.quartz-scheduler.org/api/2.3.0/",
-			"https://hc.apache.org/httpcomponents-client-5.4.x/current/httpclient5/apidocs/",
+			"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://junit.org/junit5/docs/5.12.2/api/",
+			"https://docs.junit.org/5.13.4/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/",

buildSrc/build.gradle

@@ -20,6 +20,7 @@ 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.gradle:test-retry-gradle-plugin:1.6.2"
 	implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}"

buildSrc/config/checkstyle/checkstyle.xml

@@ -6,7 +6,7 @@
 	<module name="io.spring.javaformat.checkstyle.check.SpringHeaderCheck">
 		<property name="fileExtensions" value="java"/>
 		<property name="headerType" value="apache2"/>
-		<property name="headerCopyrightPattern" value="20\d\d-20\d\d"/>
+		<property name="headerCopyrightPattern" value="20\d\d-present"/>
 		<property name="packageInfoHeaderType" value="none"/>
 	</module>
 	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck"/>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-present 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.
@@ -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("10.23.1");
+			checkstyle.setToolVersion("11.0.0");
 			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/ConventionsPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-present 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-present 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.
@@ -26,7 +26,6 @@
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
-import org.gradle.jvm.toolchain.JvmVendorSpec;
 
 /**
  * {@link Plugin} that applies conventions for compiling Java sources in Spring Framework.
@@ -86,7 +85,6 @@ public void apply(Project project) {
 	 */
 	private static void applyToolchainConventions(Project project) {
 		project.getExtensions().getByType(JavaPluginExtension.class).toolchain(toolchain -> {
-			toolchain.getVendor().set(JvmVendorSpec.BELLSOFT);
 			toolchain.getLanguageVersion().set(DEFAULT_LANGUAGE_VERSION);
 		});
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-present 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,10 @@
 package org.springframework.build;
 
 import org.gradle.api.Project;
+import org.gradle.api.tasks.SourceSet;
+import org.gradle.api.tasks.SourceSetContainer;
+import org.jetbrains.dokka.gradle.DokkaExtension;
+import org.jetbrains.dokka.gradle.DokkaPlugin;
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget;
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion;
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;
@@ -28,24 +32,62 @@
 public class KotlinConventions {
 
 	void apply(Project project) {
-		project.getPlugins().withId("org.jetbrains.kotlin.jvm",
-				(plugin) -> project.getTasks().withType(KotlinCompile.class, this::configure));
+		project.getPlugins().withId("org.jetbrains.kotlin.jvm", plugin -> {
+			project.getTasks().withType(KotlinCompile.class, this::configure);
+			if (project.getLayout().getProjectDirectory().dir("src/main/kotlin").getAsFile().exists()) {
+				project.getPlugins().apply(DokkaPlugin.class);
+				project.getExtensions().configure(DokkaExtension.class, dokka -> configure(project, dokka));
+				project.project(":framework-api").getDependencies().add("dokka", project);
+			}
+		});
 	}
 
 	private void configure(KotlinCompile compile) {
 		compile.compilerOptions(options -> {
-			options.getApiVersion().set(KotlinVersion.KOTLIN_2_1);
-			options.getLanguageVersion().set(KotlinVersion.KOTLIN_2_1);
+			options.getApiVersion().set(KotlinVersion.KOTLIN_2_2);
+			options.getLanguageVersion().set(KotlinVersion.KOTLIN_2_2);
 			options.getJvmTarget().set(JvmTarget.JVM_17);
 			options.getJavaParameters().set(true);
 			options.getAllWarningsAsErrors().set(true);
 			options.getFreeCompilerArgs().addAll(
 					"-Xsuppress-version-warnings",
 					"-Xjsr305=strict", // For dependencies using JSR 305
 					"-opt-in=kotlin.RequiresOptIn",
-					"-Xjdk-release=17" // Needed due to https://youtrack.jetbrains.com/issue/KT-49746
+					"-Xjdk-release=17", // Needed due to https://youtrack.jetbrains.com/issue/KT-49746
+					"-Xannotation-default-target=param-property" // Upcoming default, see https://youtrack.jetbrains.com/issue/KT-73255
 			);
 		});
 	}
 
+	private void configure(Project project, DokkaExtension dokka) {
+		dokka.getDokkaSourceSets().forEach(sourceSet -> {
+			sourceSet.getSourceRoots().setFrom(project.file("src/main/kotlin"));
+			sourceSet.getClasspath()
+					.from(project.getExtensions()
+							.getByType(SourceSetContainer.class)
+							.getByName(SourceSet.MAIN_SOURCE_SET_NAME)
+							.getOutput());
+			var externalDocumentationLinks = sourceSet.getExternalDocumentationLinks();
+			var springVersion = project.getVersion();
+			externalDocumentationLinks.register("spring-framework", spec -> {
+				spec.url("https://docs.spring.io/spring-framework/docs/" + springVersion + "/javadoc-api/");
+				spec.packageListUrl("https://docs.spring.io/spring-framework/docs/" + springVersion + "/javadoc-api/element-list");
+			});
+			externalDocumentationLinks.register("reactor-core", spec ->
+					spec.url("https://projectreactor.io/docs/core/release/api/"));
+			externalDocumentationLinks.register("reactive-streams", spec ->
+					spec.url("https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/"));
+			externalDocumentationLinks.register("kotlinx-coroutines", spec ->
+					spec.url("https://kotlinlang.org/api/kotlinx.coroutines/"));
+			externalDocumentationLinks.register("hamcrest", spec ->
+					spec.url("https://javadoc.io/doc/org.hamcrest/hamcrest/2.1/"));
+			externalDocumentationLinks.register("jakarta-servlet", spec -> {
+				spec.url("https://javadoc.io/doc/jakarta.servlet/jakarta.servlet-api/latest/");
+				spec.packageListUrl("https://javadoc.io/doc/jakarta.servlet/jakarta.servlet-api/latest/element-list");
+			});
+			externalDocumentationLinks.register("rsocket-core", spec ->
+					spec.url("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"));
+		});
+	}
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-present 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.