Release v6.2.0

2026-06-08 17:33:33 +00:00 · 2024-11-14 16:43:48 +01:00
4167 changed files with 48497 additions and 29822 deletions
@@ -31,11 +31,10 @@ runs:
          ${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
          ${{ inputs.java-toolchain == 'true' && '17' || '' }}
    - name: Set Up Gradle
-      uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
+      uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
      with:
        cache-read-only: false
        develocity-access-key: ${{ inputs.develocity-access-key }}
-        develocity-token-expiry: 4
    - name: Configure Gradle Properties
      shell: bash
      run: |
@@ -20,7 +20,7 @@ runs:
  using: composite
  steps:
    - name: Set Up JFrog CLI
-      uses: jfrog/setup-jfrog-cli@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2
+      uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
      env:
        JF_ENV_SPRING: ${{ inputs.jfrog-cli-config-token }}
    - name: Download Release Artifacts
@@ -1,3 +0,0 @@
-require:
-  members: false
-
@@ -21,13 +21,13 @@ jobs:
          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
          publish: true
      - name: Deploy
-        uses: spring-io/artifactory-deploy-action@dc1913008c0599f0c4b1fdafb6ff3c502b3565ea # v0.0.2
+        uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
        with:
          artifact-properties: |
            /**/framework-api-*.zip::zip.name=spring-framework,zip.deployed=false
            /**/framework-api-*-docs.zip::zip.type=docs
            /**/framework-api-*-schema.zip::zip.type=schema
-          build-name: 'spring-framework-7.0.x'
+          build-name: 'spring-framework-6.2.x'
          folder: 'deployment-repository'
          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
          repository: 'libs-snapshot-local'
@@ -9,11 +9,22 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 60
    steps:
-      - name: Check Out Code
+      - name: Set Up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'liberica'
+          java-version: '17'
+      - name: Check Out
        uses: actions/checkout@v4
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
+      - name: Set Up Gradle
+        uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
      - name: Build
-        id: build
-        uses: ./.github/actions/build
+        env:
+          CI: 'true'
+          GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
+        run: ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --no-parallel --continue build
      - name: Print JVM Thread Dumps When Cancelled
        if: cancelled()
        uses: ./.github/actions/print-jvm-thread-dumps
@@ -2,14 +2,14 @@ name: Release Milestone
 on:
  push:
    tags:
-      - v7.0.0-M[1-9]
-      - v7.0.0-RC[1-9]
+      - v6.2.0-M[1-9]
+      - v6.2.0-RC[1-9]
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
  build-and-stage-release:
-    name: Build and Stage Release
    if: ${{ github.repository == 'spring-projects/spring-framework' }}
+    name: Build and Stage Release
    runs-on: ubuntu-latest
    steps:
      - name: Check Out Code
@@ -18,7 +18,7 @@ jobs:
        id: build-and-publish
        uses: ./.github/actions/build
        with:
-          develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
+          develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
          publish: true
      - name: Stage Release
        uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
@@ -41,40 +41,23 @@ jobs:
    name: Verify
    needs: build-and-stage-release
    uses: ./.github/workflows/verify.yml
+    with:
+      staging: true
+      version: ${{ needs.build-and-stage-release.outputs.version }}
    secrets:
      google-chat-webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
      repository-password: ${{ secrets.ARTIFACTORY_PASSWORD }}
      repository-username: ${{ secrets.ARTIFACTORY_USERNAME }}
      token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-    with:
-      staging: true
-      version: ${{ needs.build-and-stage-release.outputs.version }}
-  sync-to-maven-central:
-    name: Sync to Maven Central
+  promote-release:
+    name: Promote Release
    needs:
      - build-and-stage-release
      - verify
    runs-on: ubuntu-latest
-    steps:
-      - name: Check Out Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - name: Sync to Maven Central
-        uses: ./.github/actions/sync-to-maven-central
-        with:
-          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
-    needs:
-      - build-and-stage-release
-      - sync-to-maven-central
-    runs-on: ubuntu-latest
    steps:
      - name: Set up JFrog CLI
-        uses: jfrog/setup-jfrog-cli@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2
+        uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
        env:
          JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
      - name: Promote build
@@ -2,7 +2,7 @@ name: Release
 on:
  push:
    tags:
-      - v7.0.[0-9]+
+      - v6.2.[0-9]+
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
@@ -73,7 +73,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Set up JFrog CLI
-        uses: jfrog/setup-jfrog-cli@dff217c085c17666e8849ebdbf29c8fe5e3995e6 # v4.5.2
+        uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
        env:
          JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
      - name: Promote build
@@ -12,9 +12,8 @@ permissions:

 jobs:
  update-antora-ui-spring:
-    name: Update on Supported Branches
-    if: ${{ github.repository == 'spring-projects/spring-framework' }}
    runs-on: ubuntu-latest
+    name: Update on Supported Branches
    strategy:
      matrix:
        branch: [ '6.1.x' ]
@@ -26,9 +25,8 @@ jobs:
          token: ${{ secrets.GITHUB_TOKEN }}
          antora-file-path: 'framework-docs/antora-playbook.yml'
  update-antora-ui-spring-docs-build:
-    name: Update on docs-build
-    if: ${{ github.repository == 'spring-projects/spring-framework' }}
    runs-on: ubuntu-latest
+    name: Update on docs-build
    steps:
      - uses: spring-io/spring-doc-actions/update-antora-spring-ui@5a57bcc6a0da2a1474136cf29571b277850432bc
        name: Update
@@ -46,7 +46,7 @@ jobs:
          distribution: 'liberica'
          java-version: 17
      - name: Set Up Gradle
-        uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
+        uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0
        with:
          cache-read-only: false
      - name: Configure Gradle Properties
@@ -53,4 +53,3 @@ atlassian-ide-plugin.xml
 cached-antora-playbook.yml

 node_modules
-/.kotlin/
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=23.0.1-librca
+java=17.0.12-librca
@@ -16,7 +16,7 @@ First off, thank you for taking the time to contribute! :+1: :tada:

 ### Code of Conduct

-This project is governed by the [Spring Code of Conduct](https://github.com/spring-projects/spring-framework#coc-ov-file).
+This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc).
 By participating you are expected to uphold this code.
 Please report unacceptable behavior to spring-code-of-conduct@spring.io.

@@ -65,6 +65,10 @@ follow-up reports will need to be created as new issues with a fresh description

 #### Submit a Pull Request

+1. If you have not previously done so, please sign the
+[Contributor License Agreement](https://cla.spring.io/sign/spring). You will be reminded
+automatically when you submit the PR.
+
 1. Should you create an issue first? No, just create the pull request and use the
 description to provide context and motivation, as you would for an issue. If you want
 to start a discussion first or have already created an issue, once a pull request is
@@ -81,11 +85,6 @@ multiple edits or corrections of the same logical change. See
 [Rewriting History section of Pro Git](https://git-scm.com/book/en/Git-Tools-Rewriting-History)
 for an overview of streamlining the commit history.

-1. 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.
-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).
-
 1. Format commit messages using 55 characters for the subject line, 72 characters per line
 for the description, followed by the issue fixed, for example, `Closes gh-22276`. See the
 [Commit Guidelines section of Pro Git](https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project#Commit-Guidelines)
@@ -25,17 +25,17 @@ configure(allprojects) { project ->
 	repositories {
 		mavenCentral()
 		maven {
-			url = "https://repo.spring.io/milestone"
+			url "https://repo.spring.io/milestone"
 			content {
 				// Netty 5 optional support
 				includeGroup 'io.projectreactor.netty'
 			}
 		}
 		if (version.contains('-')) {
-			maven { url = "https://repo.spring.io/milestone" }
+			maven { url "https://repo.spring.io/milestone" }
 		}
 		if (version.endsWith('-SNAPSHOT')) {
-			maven { url = "https://repo.spring.io/snapshot" }
+			maven { url "https://repo.spring.io/snapshot" }
 		}
 	}
 	configurations.all {
@@ -80,13 +80,18 @@ configure([rootProject] + javaProjects) { project ->
 		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 		testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
 		testRuntimeOnly("org.apache.logging.log4j:log4j-core")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl")
+		// JSR-305 only used for non-required meta-annotations
+		compileOnly("com.google.code.findbugs:jsr305")
+		testCompileOnly("com.google.code.findbugs:jsr305")
 	}

 	ext.javadocLinks = [
 			"https://docs.oracle.com/en/java/javase/17/docs/api/",
-			"https://jakarta.ee/specifications/platform/11/apidocs/",
+			"https://jakarta.ee/specifications/platform/9/apidocs/",
 			"https://docs.jboss.org/hibernate/orm/5.6/javadocs/",
-			"https://eclipse.dev/aspectj/doc/released/1.9.22.1/aspectjrt/",
+			"https://eclipse.dev/aspectj/doc/released/aspectj5rt-api",
 			"https://www.quartz-scheduler.org/api/2.3.0/",
 			"https://fasterxml.github.io/jackson-core/javadoc/2.14/",
 			"https://fasterxml.github.io/jackson-databind/javadoc/2.14/",
@@ -97,15 +102,14 @@ configure([rootProject] + javaProjects) { project ->
 			// TODO Uncomment link to JUnit 5 docs once we execute Gradle with Java 18+.
 			// See https://github.com/spring-projects/spring-framework/issues/27497
 			//
-			// "https://junit.org/junit5/docs/5.11.4/api/",
+			// "https://junit.org/junit5/docs/5.11.3/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/com.google.code.findbugs/jsr305/3.0.2/"
 	] as String[]
 }

@@ -9,18 +9,7 @@ The `org.springframework.build.conventions` plugin applies all conventions to th

 * Configuring the Java compiler, see `JavaConventions`
 * Configuring the Kotlin compiler, see `KotlinConventions`
-* Configuring testing in the build with `TestConventions`
-* Configuring the ArchUnit rules for the project, see `org.springframework.build.architecture.ArchitectureRules`
-
-This plugin also provides a DSL extension to optionally enable Java preview features for
-compiling and testing sources in a module. This can be applied with the following in a
-module build file:
-
-```groovy
-springFramework {
-	enableJavaPreviewFeatures = true
-}
-```
+* Configuring testing in the build with `TestConventions` 


 ## Build Plugins
@@ -20,7 +20,7 @@ ext {
 dependencies {
 	checkstyle "io.spring.javaformat:spring-javaformat-checkstyle:${javaFormatVersion}"
 	implementation "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
-	implementation "com.tngtech.archunit:archunit:1.3.0"
+	implementation "org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}"
 	implementation "org.gradle:test-retry-gradle-plugin:1.5.6"
 	implementation "io.spring.javaformat:spring-javaformat-gradle-plugin:${javaFormatVersion}"
 	implementation "io.spring.nohttp:nohttp-gradle:0.0.11"
@@ -28,10 +28,6 @@ dependencies {

 gradlePlugin {
 	plugins {
-		architecturePlugin {
-			id = "org.springframework.architecture"
-			implementationClass = "org.springframework.build.architecture.ArchitecturePlugin"
-		}
 		conventionsPlugin {
 			id = "org.springframework.build.conventions"
 			implementationClass = "org.springframework.build.ConventionsPlugin"
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2025 the original author or authors.
+ * Copyright 2002-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.
@@ -50,7 +50,7 @@ public class CheckstyleConventions {
 			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.21.1");
+			checkstyle.setToolVersion("10.20.1");
 			checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 			String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 			DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();
@@ -21,15 +21,12 @@ import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaBasePlugin;
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin;

-import org.springframework.build.architecture.ArchitecturePlugin;
-
 /**
 * Plugin to apply conventions to projects that are part of Spring Framework's build.
 * Conventions are applied in response to various plugins being applied.
 *
 * <p>When the {@link JavaBasePlugin} is applied, the conventions in {@link CheckstyleConventions},
 * {@link TestConventions} and {@link JavaConventions} are applied.
- * The {@link ArchitecturePlugin} plugin is also applied.
 * When the {@link KotlinBasePlugin} is applied, the conventions in {@link KotlinConventions}
 * are applied.
 *
@@ -39,8 +36,6 @@ public class ConventionsPlugin implements Plugin<Project> {

 	@Override
 	public void apply(Project project) {
-		project.getExtensions().create("springFramework", SpringFrameworkExtension.class);
-		new ArchitecturePlugin().apply(project);
 		new CheckstyleConventions().apply(project);
 		new JavaConventions().apply(project);
 		new KotlinConventions().apply(project);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -73,42 +73,21 @@ public class JavaConventions {
 	private void applyJavaCompileConventions(Project project) {
 		project.getExtensions().getByType(JavaPluginExtension.class).toolchain(toolchain -> {
 			toolchain.getVendor().set(JvmVendorSpec.BELLSOFT);
-			toolchain.getLanguageVersion().set(JavaLanguageVersion.of(23));
+			toolchain.getLanguageVersion().set(JavaLanguageVersion.of(17));
 		});
-		SpringFrameworkExtension frameworkExtension = project.getExtensions().getByType(SpringFrameworkExtension.class);
-		project.afterEvaluate(p -> {
-			p.getTasks().withType(JavaCompile.class)
-					.matching(compileTask -> compileTask.getName().startsWith(JavaPlugin.COMPILE_JAVA_TASK_NAME))
-					.forEach(compileTask -> {
-						compileTask.getOptions().setCompilerArgs(COMPILER_ARGS);
-						compileTask.getOptions().getCompilerArgumentProviders().add(frameworkExtension.asArgumentProvider());
-						compileTask.getOptions().setEncoding("UTF-8");
-						setJavaRelease(compileTask);
-					});
-			p.getTasks().withType(JavaCompile.class)
-					.matching(compileTask -> compileTask.getName().startsWith(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME)
-							|| compileTask.getName().equals("compileTestFixturesJava"))
-					.forEach(compileTask -> {
-						compileTask.getOptions().setCompilerArgs(TEST_COMPILER_ARGS);
-						compileTask.getOptions().getCompilerArgumentProviders().add(frameworkExtension.asArgumentProvider());
-						compileTask.getOptions().setEncoding("UTF-8");
-						setJavaRelease(compileTask);
-					});
-
-		});
-	}
-
-	private void setJavaRelease(JavaCompile task) {
-		int defaultVersion = 17;
-		int releaseVersion = defaultVersion;
-		int compilerVersion = task.getJavaCompiler().get().getMetadata().getLanguageVersion().asInt();
-		for (int version = defaultVersion ; version <= compilerVersion ; version++) {
-			if (task.getName().contains("Java" + version)) {
-				releaseVersion = version;
-				break;
-			}
-		}
-		task.getOptions().getRelease().set(releaseVersion);
+		project.getTasks().withType(JavaCompile.class)
+				.matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_JAVA_TASK_NAME))
+				.forEach(compileTask -> {
+					compileTask.getOptions().setCompilerArgs(COMPILER_ARGS);
+					compileTask.getOptions().setEncoding("UTF-8");
+				});
+		project.getTasks().withType(JavaCompile.class)
+				.matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME)
+						|| compileTask.getName().equals("compileTestFixturesJava"))
+				.forEach(compileTask -> {
+					compileTask.getOptions().setCompilerArgs(TEST_COMPILER_ARGS);
+					compileTask.getOptions().setEncoding("UTF-8");
+				});
 	}

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

 package org.springframework.build;

+import java.util.ArrayList;
+import java.util.List;
+
 import org.gradle.api.Project;
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget;
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion;
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions;
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;

 /**
 * @author Brian Clozel
- * @author Sebastien Deleuze
 */
 public class KotlinConventions {

@@ -33,19 +34,15 @@ public class KotlinConventions {
 	}

 	private void configure(KotlinCompile compile) {
-		compile.compilerOptions(options -> {
-			options.getApiVersion().set(KotlinVersion.KOTLIN_2_1);
-			options.getLanguageVersion().set(KotlinVersion.KOTLIN_2_1);
-			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
-			);
-		});
+		KotlinJvmOptions kotlinOptions = compile.getKotlinOptions();
+		kotlinOptions.setApiVersion("1.7");
+		kotlinOptions.setLanguageVersion("1.7");
+		kotlinOptions.setJvmTarget("17");
+		kotlinOptions.setJavaParameters(true);
+		kotlinOptions.setAllWarningsAsErrors(true);
+		List<String> freeCompilerArgs = new ArrayList<>(compile.getKotlinOptions().getFreeCompilerArgs());
+		freeCompilerArgs.addAll(List.of("-Xsuppress-version-warnings", "-Xjsr305=strict", "-opt-in=kotlin.RequiresOptIn"));
+		compile.getKotlinOptions().setFreeCompilerArgs(freeCompilerArgs);
 	}

 }
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.build;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.gradle.api.Project;
-import org.gradle.api.provider.Property;
-import org.gradle.process.CommandLineArgumentProvider;
-
-public class SpringFrameworkExtension {
-
-	private final Property<Boolean> enableJavaPreviewFeatures;
-
-	public SpringFrameworkExtension(Project project) {
-		this.enableJavaPreviewFeatures = project.getObjects().property(Boolean.class);
-	}
-
-	public Property<Boolean> getEnableJavaPreviewFeatures() {
-		return this.enableJavaPreviewFeatures;
-	}
-
-	public CommandLineArgumentProvider asArgumentProvider() {
-		return () -> {
-			if (getEnableJavaPreviewFeatures().getOrElse(false)) {
-				return List.of("--enable-preview");
-			}
-			return Collections.emptyList();
-		};
-	}
-}
@@ -67,8 +67,6 @@ class TestConventions {
 				"--add-opens=java.base/java.util=ALL-UNNAMED",
 				"-Xshare:off"
 		);
-		test.getJvmArgumentProviders().add(project.getExtensions()
-				.getByType(SpringFrameworkExtension.class).asArgumentProvider());
 	}

 	private void configureTestRetryPlugin(Project project, Test test) {
@@ -1,132 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.build.architecture;
-
-import com.tngtech.archunit.core.domain.JavaClasses;
-import com.tngtech.archunit.core.importer.ClassFileImporter;
-import com.tngtech.archunit.lang.ArchRule;
-import com.tngtech.archunit.lang.EvaluationResult;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.StandardOpenOption;
-import java.util.List;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.GradleException;
-import org.gradle.api.Task;
-import org.gradle.api.file.DirectoryProperty;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.file.FileTree;
-import org.gradle.api.provider.ListProperty;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.IgnoreEmptyDirectories;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputFiles;
-import org.gradle.api.tasks.Internal;
-import org.gradle.api.tasks.Optional;
-import org.gradle.api.tasks.OutputDirectory;
-import org.gradle.api.tasks.PathSensitive;
-import org.gradle.api.tasks.PathSensitivity;
-import org.gradle.api.tasks.SkipWhenEmpty;
-import org.gradle.api.tasks.TaskAction;
-
-import static org.springframework.build.architecture.ArchitectureRules.*;
-
-/**
- * {@link Task} that checks for architecture problems.
- *
- * @author Andy Wilkinson
- * @author Scott Frederick
- */
-public abstract class ArchitectureCheck extends DefaultTask {
-
-	private FileCollection classes;
-
-	public ArchitectureCheck() {
-		getOutputDirectory().convention(getProject().getLayout().getBuildDirectory().dir(getName()));
-		getProhibitObjectsRequireNonNull().convention(true);
-		getRules().addAll(packageInfoShouldBeNullMarked(),
-				classesShouldNotImportForbiddenTypes(),
-				javaClassesShouldNotImportKotlinAnnotations(),
-				allPackagesShouldBeFreeOfTangles(),
-				noClassesShouldCallStringToLowerCaseWithoutLocale(),
-				noClassesShouldCallStringToUpperCaseWithoutLocale());
-		getRuleDescriptions().set(getRules().map((rules) -> rules.stream().map(ArchRule::getDescription).toList()));
-	}
-
-	@TaskAction
-	void checkArchitecture() throws IOException {
-		JavaClasses javaClasses = new ClassFileImporter()
-				.importPaths(this.classes.getFiles().stream().map(File::toPath).toList());
-		List<EvaluationResult> violations = getRules().get()
-				.stream()
-				.map((rule) -> rule.evaluate(javaClasses))
-				.filter(EvaluationResult::hasViolation)
-				.toList();
-		File outputFile = getOutputDirectory().file("failure-report.txt").get().getAsFile();
-		outputFile.getParentFile().mkdirs();
-		if (!violations.isEmpty()) {
-			StringBuilder report = new StringBuilder();
-			for (EvaluationResult violation : violations) {
-				report.append(violation.getFailureReport());
-				report.append(String.format("%n"));
-			}
-			Files.writeString(outputFile.toPath(), report.toString(), StandardOpenOption.CREATE,
-					StandardOpenOption.TRUNCATE_EXISTING);
-			throw new GradleException("Architecture check failed. See '" + outputFile + "' for details.");
-		}
-		else {
-			outputFile.createNewFile();
-		}
-	}
-
-	public void setClasses(FileCollection classes) {
-		this.classes = classes;
-	}
-
-	@Internal
-	public FileCollection getClasses() {
-		return this.classes;
-	}
-
-	@InputFiles
-	@SkipWhenEmpty
-	@IgnoreEmptyDirectories
-	@PathSensitive(PathSensitivity.RELATIVE)
-	final FileTree getInputClasses() {
-		return this.classes.getAsFileTree();
-	}
-
-	@Optional
-	@InputFiles
-	@PathSensitive(PathSensitivity.RELATIVE)
-	public abstract DirectoryProperty getResourcesDirectory();
-
-	@OutputDirectory
-	public abstract DirectoryProperty getOutputDirectory();
-
-	@Internal
-	public abstract ListProperty<ArchRule> getRules();
-
-	@Internal
-	public abstract Property<Boolean> getProhibitObjectsRequireNonNull();
-
-	@Input
-	// The rules themselves can't be an input as they aren't serializable so we use
-	// their descriptions instead
-	abstract ListProperty<String> getRuleDescriptions();
-}
@@ -1,74 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.build.architecture;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.gradle.api.Plugin;
-import org.gradle.api.Project;
-import org.gradle.api.Task;
-import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginExtension;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.TaskProvider;
-import org.gradle.language.base.plugins.LifecycleBasePlugin;
-
-/**
- * {@link Plugin} for verifying a project's architecture.
- *
- * @author Andy Wilkinson
- */
-public class ArchitecturePlugin implements Plugin<Project> {
-
-	@Override
-	public void apply(Project project) {
-		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> registerTasks(project));
-	}
-
-	private void registerTasks(Project project) {
-		JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
-		List<TaskProvider<ArchitectureCheck>> architectureChecks = new ArrayList<>();
-		for (SourceSet sourceSet : javaPluginExtension.getSourceSets()) {
-			if (sourceSet.getName().contains("test")) {
-				// skip test source sets.
-				continue;
-			}
-			TaskProvider<ArchitectureCheck> checkArchitecture = project.getTasks()
-					.register(taskName(sourceSet), ArchitectureCheck.class,
-							(task) -> {
-								task.setClasses(sourceSet.getOutput().getClassesDirs());
-								task.getResourcesDirectory().set(sourceSet.getOutput().getResourcesDir());
-								task.dependsOn(sourceSet.getProcessResourcesTaskName());
-								task.setDescription("Checks the architecture of the classes of the " + sourceSet.getName()
-										+ " source set.");
-								task.setGroup(LifecycleBasePlugin.VERIFICATION_GROUP);
-							});
-			architectureChecks.add(checkArchitecture);
-		}
-		if (!architectureChecks.isEmpty()) {
-			TaskProvider<Task> checkTask = project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME);
-			checkTask.configure((check) -> check.dependsOn(architectureChecks));
-		}
-	}
-
-	private static String taskName(SourceSet sourceSet) {
-		return "checkArchitecture"
-				+ sourceSet.getName().substring(0, 1).toUpperCase()
-				+ sourceSet.getName().substring(1);
-	}
-
-}
@@ -1,107 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.build.architecture;
-
-import com.tngtech.archunit.base.DescribedPredicate;
-import com.tngtech.archunit.core.domain.JavaClass;
-import com.tngtech.archunit.lang.ArchRule;
-import com.tngtech.archunit.lang.syntax.ArchRuleDefinition;
-import com.tngtech.archunit.library.dependencies.SliceAssignment;
-import com.tngtech.archunit.library.dependencies.SliceIdentifier;
-import com.tngtech.archunit.library.dependencies.SlicesRuleDefinition;
-import java.util.List;
-
-abstract class ArchitectureRules {
-
-	static ArchRule allPackagesShouldBeFreeOfTangles() {
-		return SlicesRuleDefinition.slices()
-				.assignedFrom(new SpringSlices()).should().beFreeOfCycles();
-	}
-
-	static ArchRule noClassesShouldCallStringToLowerCaseWithoutLocale() {
-		return ArchRuleDefinition.noClasses()
-				.should()
-				.callMethod(String.class, "toLowerCase")
-				.because("String.toLowerCase(Locale.ROOT) should be used instead");
-	}
-
-	static ArchRule noClassesShouldCallStringToUpperCaseWithoutLocale() {
-		return ArchRuleDefinition.noClasses()
-				.should()
-				.callMethod(String.class, "toUpperCase")
-				.because("String.toUpperCase(Locale.ROOT) should be used instead");
-	}
-
-	static ArchRule packageInfoShouldBeNullMarked() {
-		return ArchRuleDefinition.classes()
-				.that().haveSimpleName("package-info")
-				.should().beAnnotatedWith("org.jspecify.annotations.NullMarked")
-				.allowEmptyShould(true);
-	}
-
-	static ArchRule classesShouldNotImportForbiddenTypes() {
-		return ArchRuleDefinition.noClasses()
-				.should().dependOnClassesThat()
-				.haveFullyQualifiedName("reactor.core.support.Assert")
-				.orShould().dependOnClassesThat()
-				.haveFullyQualifiedName("org.slf4j.LoggerFactory")
-				.orShould().dependOnClassesThat()
-				.haveFullyQualifiedName("org.springframework.lang.NonNull")
-				.orShould().dependOnClassesThat()
-				.haveFullyQualifiedName("org.springframework.lang.Nullable");
-	}
-
-	static ArchRule javaClassesShouldNotImportKotlinAnnotations() {
-		return ArchRuleDefinition.noClasses()
-				.that(new DescribedPredicate<JavaClass>("is not a Kotlin class") {
-						  @Override
-						  public boolean test(JavaClass javaClass) {
-							  return javaClass.getSourceCodeLocation()
-									  .getSourceFileName().endsWith(".java");
-						  }
-					  }
-				)
-				.should().dependOnClassesThat()
-				.resideInAnyPackage("org.jetbrains.annotations..")
-				.allowEmptyShould(true);
-	}
-
-	static class SpringSlices implements SliceAssignment {
-
-		private final List<String> ignoredPackages = List.of("org.springframework.asm",
-				"org.springframework.cglib",
-				"org.springframework.javapoet",
-				"org.springframework.objenesis");
-
-		@Override
-		public SliceIdentifier getIdentifierOf(JavaClass javaClass) {
-
-			String packageName = javaClass.getPackageName();
-			for (String ignoredPackage : ignoredPackages) {
-				if (packageName.startsWith(ignoredPackage)) {
-					return SliceIdentifier.ignore();
-				}
-			}
-			return SliceIdentifier.of("spring framework");
-		}
-
-		@Override
-		public String getDescription() {
-			return "Spring Framework Slices";
-		}
-	}
-}
@@ -9,7 +9,7 @@ apply from: "${rootDir}/gradle/publications.gradle"

 repositories {
 	maven {
-		url = "https://repo.spring.io/release"
+		url "https://repo.spring.io/release"
 	}
 }

@@ -87,7 +87,7 @@ tasks.register('schemaZip', Zip) {
 	archiveClassifier.set("schema")
 	description = "Builds -${archiveClassifier} archive containing all " +
 			"XSDs for deployment at https://springframework.org/schema."
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+	duplicatesStrategy DuplicatesStrategy.EXCLUDE
 	moduleProjects.each { module ->
 		def Properties schemas = new Properties();

@@ -36,4 +36,4 @@ runtime:
    failure_level: warn
 ui:
  bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.18/ui-bundle.zip
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.17/ui-bundle.zip
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
-
 plugins {
 	id 'kotlin'
 	id 'io.spring.antora.generate-antora-yml' version '0.0.1'
@@ -39,15 +37,10 @@ javadoc {

 repositories {
 	maven {
-		url = "https://repo.spring.io/release"
+		url "https://repo.spring.io/release"
 	}
 }

-// To avoid a redeclaration error with Kotlin compiler
-tasks.named('compileKotlin', KotlinCompilationTask.class) {
-    javaSources.from = []
-}
-
 dependencies {
 	api(project(":spring-aspects"))
 	api(project(":spring-context"))
@@ -69,7 +62,6 @@ dependencies {
 	api("jakarta.servlet:jakarta.servlet-api")
 	api("jakarta.resource:jakarta.resource-api")
 	api("jakarta.validation:jakarta.validation-api")
-	api("jakarta.websocket:jakarta.websocket-client-api")
 	api("javax.cache:cache-api")
 	api("org.apache.activemq:activemq-ra:6.1.2")
 	api("org.apache.commons:commons-dbcp2:2.11.0")
@@ -60,7 +60,6 @@
 **** xref:core/expressions/language-ref/constructors.adoc[]
 **** xref:core/expressions/language-ref/variables.adoc[]
 **** xref:core/expressions/language-ref/functions.adoc[]
-**** xref:core/expressions/language-ref/varargs.adoc[]
 **** xref:core/expressions/language-ref/bean-references.adoc[]
 **** xref:core/expressions/language-ref/operator-ternary.adoc[]
 **** xref:core/expressions/language-ref/operator-elvis.adoc[]
@@ -101,6 +100,7 @@
 *** xref:core/aop-api/extensibility.adoc[]
 ** xref:core/null-safety.adoc[]
 ** xref:core/databuffer-codec.adoc[]
+** xref:core/spring-jcl.adoc[]
 ** xref:core/aot.adoc[]
 ** xref:core/appendix.adoc[]
 *** xref:core/appendix/xsd-schemas.adoc[]
@@ -160,6 +160,7 @@
 **** xref:web/webmvc/mvc-servlet/exceptionhandlers.adoc[]
 **** xref:web/webmvc/mvc-servlet/viewresolver.adoc[]
 **** xref:web/webmvc/mvc-servlet/localeresolver.adoc[]
+**** xref:web/webmvc/mvc-servlet/themeresolver.adoc[]
 **** xref:web/webmvc/mvc-servlet/multipart.adoc[]
 **** xref:web/webmvc/mvc-servlet/logging.adoc[]
 *** xref:web/webmvc/filters.adoc[]
@@ -33,11 +33,11 @@ arbitrary advice types. This section describes the basic concepts and standard a
 [[aop-api-advice-around]]
 === Interception Around Advice

-The most fundamental advice type in Spring is _interception around advice_.
+The most fundamental advice type in Spring is interception around advice.

-Spring is compliant with the AOP Alliance interface for around advice that uses method
-interception. Classes that implement around advice should therefore implement the
-following `MethodInterceptor` interface from the `org.aopalliance.intercept` package:
+Spring is compliant with the AOP `Alliance` interface for around advice that uses method
+interception. Classes that implement `MethodInterceptor` and that implement around advice should also implement the
+following interface:

 [source,java,indent=0,subs="verbatim,quotes"]
 ----
@@ -49,8 +49,8 @@ following `MethodInterceptor` interface from the `org.aopalliance.intercept` pac

 The `MethodInvocation` argument to the `invoke()` method exposes the method being
 invoked, the target join point, the AOP proxy, and the arguments to the method. The
-`invoke()` method should return the invocation's result: typically the return value of
-the join point.
+`invoke()` method should return the invocation's result: the return value of the join
+point.

 The following example shows a simple `MethodInterceptor` implementation:

@@ -64,9 +64,9 @@ Java::

 		public Object invoke(MethodInvocation invocation) throws Throwable {
 			System.out.println("Before: invocation=[" + invocation + "]");
-			Object result = invocation.proceed();
+			Object rval = invocation.proceed();
 			System.out.println("Invocation returned");
-			return result;
+			return rval;
 		}
 	}
 ----
@@ -79,9 +79,9 @@ Kotlin::

 		override fun invoke(invocation: MethodInvocation): Any {
 			println("Before: invocation=[$invocation]")
-			val result = invocation.proceed()
+			val rval = invocation.proceed()
 			println("Invocation returned")
-			return result
+			return rval
 		}
 	}
 ----
@@ -105,7 +105,7 @@ currently define pointcut interfaces.
 [[aop-api-advice-before]]
 === Before Advice

-A simpler advice type is a _before advice_. This does not need a `MethodInvocation`
+A simpler advice type is a before advice. This does not need a `MethodInvocation`
 object, since it is called only before entering the method.

 The main advantage of a before advice is that there is no need to invoke the `proceed()`
@@ -122,6 +122,10 @@ The following listing shows the `MethodBeforeAdvice` interface:
 	}
 ----

+(Spring's API design would allow for
+field before advice, although the usual objects apply to field interception and it is
+unlikely for Spring to ever implement it.)
+
 Note that the return type is `void`. Before advice can insert custom behavior before the join
 point runs but cannot change the return value. If a before advice throws an
 exception, it stops further execution of the interceptor chain. The exception
@@ -172,10 +176,10 @@ TIP: Before advice can be used with any pointcut.
 [[aop-api-advice-throws]]
 === Throws Advice

-_Throws advice_ is invoked after the return of the join point if the join point threw
+Throws advice is invoked after the return of the join point if the join point threw
 an exception. Spring offers typed throws advice. Note that this means that the
 `org.springframework.aop.ThrowsAdvice` interface does not contain any methods. It is a
-marker interface identifying that the given object implements one or more typed throws
+tag interface identifying that the given object implements one or more typed throws
 advice methods. These should be in the following form:

 [source,java,indent=0,subs="verbatim,quotes"]
@@ -185,10 +189,9 @@ advice methods. These should be in the following form:

 Only the last argument is required. The method signatures may have either one or four
 arguments, depending on whether the advice method is interested in the method and
-arguments. The next two listings show classes that are examples of throws advice.
+arguments. The next two listing show classes that are examples of throws advice.

-The following advice is invoked if a `RemoteException` is thrown (including subclasses of
-`RemoteException`):
+The following advice is invoked if a `RemoteException` is thrown (including from subclasses):

 [tabs]
 ======
@@ -217,9 +220,9 @@ Kotlin::
 ----
 ======

-Unlike the preceding advice, the next example declares four arguments, so that it has
-access to the invoked method, method arguments, and target object. The following advice
-is invoked if a `ServletException` is thrown:
+Unlike the preceding
+advice, the next example declares four arguments, so that it has access to the invoked method, method
+arguments, and target object. The following advice is invoked if a `ServletException` is thrown:

 [tabs]
 ======
@@ -301,7 +304,7 @@ TIP: Throws advice can be used with any pointcut.
 [[aop-api-advice-after-returning]]
 === After Returning Advice

-An _after returning advice_ in Spring must implement the
+An after returning advice in Spring must implement the
 `org.springframework.aop.AfterReturningAdvice` interface, which the following listing shows:

 [source,java,indent=0,subs="verbatim,quotes"]
@@ -365,7 +368,7 @@ TIP: After returning advice can be used with any pointcut.
 [[aop-api-advice-introduction]]
 === Introduction Advice

-Spring treats _introduction advice_ as a special kind of interception advice.
+Spring treats introduction advice as a special kind of interception advice.

 Introduction requires an `IntroductionAdvisor` and an `IntroductionInterceptor` that
 implement the following interface:
@@ -206,17 +206,18 @@ another file or files. The following example shows how to do so:
 	<beans>
 		<import resource="services.xml"/>
 		<import resource="resources/messageSource.xml"/>
+		<import resource="/resources/themeSource.xml"/>

 		<bean id="bean1" class="..."/>
 		<bean id="bean2" class="..."/>
 	</beans>
 ----

-In the preceding example, external bean definitions are loaded from the files
-`services.xml` and `messageSource.xml`. All location paths are
+In the preceding example, external bean definitions are loaded from three files:
+`services.xml`, `messageSource.xml`, and `themeSource.xml`. All location paths are
 relative to the definition file doing the importing, so `services.xml` must be in the
 same directory or classpath location as the file doing the importing, while
-`messageSource.xml` must be in a `resources` location below the
+`messageSource.xml` and `themeSource.xml` must be in a `resources` location below the
 location of the importing file. As you can see, a leading slash is ignored. However, given
 that these paths are relative, it is better form not to use the slash at all. The
 contents of the files being imported, including the top level `<beans/>` element, must
@@ -674,7 +674,9 @@ By default, the `AnnotationBeanNameGenerator` is used. For Spring
 xref:core/beans/classpath-scanning.adoc#beans-stereotype-annotations[stereotype annotations],
 if you supply a name via the annotation's `value` attribute that name will be used as
 the name in the corresponding bean definition. This convention also applies when the
-`@jakarta.inject.Named` annotation is used instead of Spring stereotype annotations.
+following JSR-250 and JSR-330 annotations are used instead of Spring stereotype
+annotations: `@jakarta.annotation.ManagedBean`, `@javax.annotation.ManagedBean`,
+`@jakarta.inject.Named`, and `@javax.inject.Named`.

 As of Spring Framework 6.1, the name of the annotation attribute that is used to specify
 the bean name is no longer required to be `value`. Custom stereotype annotations can
@@ -578,8 +578,6 @@ Kotlin::
 ----
 ======

-NOTE: Do not define such beans to be lazy as the `ApplicationContext` will honour that and will not register the method to listen to events.
-
 The method signature once again declares the event type to which it listens,
 but, this time, with a flexible name and without implementing a specific listener interface.
 The event type can also be narrowed through generics as long as the actual event type
@@ -3,7 +3,7 @@

 If a bean is a dependency of another bean, that usually means that one bean is set as a
 property of another. Typically you accomplish this with the
-xref:core/beans/dependencies/factory-properties-detailed.adoc#beans-ref-element[`<ref/>` element]
+xref:core/beans/dependencies/factory-properties-detailed.adoc#beans-ref-element[`<ref/>` element>]
 in XML-based metadata or through xref:core/beans/dependencies/factory-autowire.adoc[autowiring].

 However, sometimes dependencies between beans are less direct. An example is when a static
@@ -168,8 +168,8 @@ listings shows how to use the `parent` attribute:

 [source,xml,indent=0,subs="verbatim,quotes"]
 ----
-	<!-- in the child (descendant) context, bean name is the same as the parent bean -->
-	<bean id="accountService" 
+	<!-- in the child (descendant) context -->
+	<bean id="accountService" <!-- bean name is the same as the parent bean -->
 		class="org.springframework.aop.framework.ProxyFactoryBean">
 		<property name="target">
 			<ref parent="accountService"/> <!-- notice how we refer to the parent bean -->
@@ -64,7 +64,7 @@ This prevents the same `@Bean` method from accidentally being invoked through a
 Java method call, which helps to reduce subtle bugs that can be hard to track down.

 When `@Bean` methods are declared within classes that are not annotated with
-`@Configuration`, or when `@Configuration(proxyBeanMethods=false)` is declared,
+`@Configuration` - or when `@Configuration(proxyBeanMethods=false)` is declared -,
 they are referred to as being processed in a "lite" mode. In such scenarios,
 `@Bean` methods are effectively a general-purpose factory method mechanism without
 special runtime processing (that is, without generating a CGLIB subclass for it).
@@ -3,10 +3,8 @@

 You can invoke constructors by using the `new` operator. You should use the fully
 qualified class name for all types except those located in the `java.lang` package
-(`Integer`, `Float`, `String`, and so on).
-xref:core/expressions/language-ref/varargs.adoc[Varargs] are also supported.
-
-The following example shows how to use the `new` operator to invoke constructors.
+(`Integer`, `Float`, `String`, and so on). The following example shows how to use the
+`new` operator to invoke constructors:

 [tabs]
 ======
@@ -14,29 +12,30 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	Inventor einstein = parser.parseExpression(
-		"new org.spring.samples.spel.inventor.Inventor('Albert Einstein', 'German')")
+	Inventor einstein = p.parseExpression(
+			"new org.spring.samples.spel.inventor.Inventor('Albert Einstein', 'German')")
 			.getValue(Inventor.class);

 	// create new Inventor instance within the add() method of List
-	parser.parseExpression(
-		"Members.add(new org.spring.samples.spel.inventor.Inventor('Albert Einstein', 'German'))")
-			.getValue(societyContext);
+	p.parseExpression(
+			"Members.add(new org.spring.samples.spel.inventor.Inventor(
+				'Albert Einstein', 'German'))").getValue(societyContext);
 ----

 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes"]
 ----
-	val einstein = parser.parseExpression(
-		"new org.spring.samples.spel.inventor.Inventor('Albert Einstein', 'German')")
+	val einstein = p.parseExpression(
+			"new org.spring.samples.spel.inventor.Inventor('Albert Einstein', 'German')")
 			.getValue(Inventor::class.java)

 	// create new Inventor instance within the add() method of List
-	parser.parseExpression(
-		"Members.add(new org.spring.samples.spel.inventor.Inventor('Albert Einstein', 'German'))")
+	p.parseExpression(
+			"Members.add(new org.spring.samples.spel.inventor.Inventor('Albert Einstein', 'German'))")
 			.getValue(societyContext)
 ----
 ======


+
@@ -2,12 +2,8 @@
 = Functions

 You can extend SpEL by registering user-defined functions that can be called within
-expressions by using the `#functionName(...)` syntax, and like with standard method
-invocations, xref:core/expressions/language-ref/varargs.adoc[varargs] are also supported
-for function invocations.
-
-Functions can be registered as _variables_ in `EvaluationContext` implementations via the
-`setVariable()` method.
+expressions by using the `#functionName(...)` syntax. Functions can be registered as
+variables in `EvaluationContext` implementations via the `setVariable()` method.

 [TIP]
 ====
@@ -114,9 +110,8 @@ potentially more efficient use cases if the `MethodHandle` target and parameters
 been fully bound prior to registration; however, partially bound handles are also
 supported.

-Consider the `String#formatted(Object...)` instance method, which produces a message
-according to a template and a variable number of arguments
-(xref:core/expressions/language-ref/varargs.adoc[varargs]).
+Consider the `String#formatted(String, Object...)` instance method, which produces a
+message according to a template and a variable number of arguments.

 You can register and use the `formatted` method as a `MethodHandle`, as the following
 example shows:
@@ -156,10 +151,10 @@ Kotlin::
 ----
 ======

-As mentioned above, binding a `MethodHandle` and registering the bound `MethodHandle` is
-also supported. This is likely to be more performant if both the target and all the
-arguments are bound. In that case no arguments are necessary in the SpEL expression, as
-the following example shows:
+As hinted above, binding a `MethodHandle` and registering the bound `MethodHandle` is also
+supported. This is likely to be more performant if both the target and all the arguments
+are bound. In that case no arguments are necessary in the SpEL expression, as the
+following example shows:

 [tabs]
 ======
@@ -173,10 +168,9 @@ Java::
 	String template = "This is a %s message with %s words: <%s>";
 	Object varargs = new Object[] { "prerecorded", 3, "Oh Hello World!", "ignored" };
 	MethodHandle mh = MethodHandles.lookup().findVirtual(String.class, "formatted",
-		MethodType.methodType(String.class, Object[].class))
+			MethodType.methodType(String.class, Object[].class))
 			.bindTo(template)
-			// Here we have to provide the arguments in a single array binding:
-			.bindTo(varargs);
+			.bindTo(varargs); //here we have to provide arguments in a single array binding
 	context.setVariable("message", mh);

 	// evaluates to "This is a prerecorded message with 3 words: <Oh Hello World!>"
@@ -195,10 +189,9 @@ Kotlin::
 	val varargs = arrayOf("prerecorded", 3, "Oh Hello World!", "ignored")

 	val mh = MethodHandles.lookup().findVirtual(String::class.java, "formatted",
-		MethodType.methodType(String::class.java, Array<Any>::class.java))
+			MethodType.methodType(String::class.java, Array<Any>::class.java))
 			.bindTo(template)
-			// Here we have to provide the arguments in a single array binding:
-			.bindTo(varargs)
+			.bindTo(varargs) //here we have to provide arguments in a single array binding
 	context.setVariable("message", mh)

 	// evaluates to "This is a prerecorded message with 3 words: <Oh Hello World!>"
@@ -208,3 +201,4 @@ Kotlin::
 ======


+
@@ -1,11 +1,9 @@
 [[expressions-methods]]
 = Methods

-You can invoke methods by using the typical Java programming syntax. You can also invoke
-methods directly on literals such as strings or numbers.
-xref:core/expressions/language-ref/varargs.adoc[Varargs] are supported as well.
-
-The following examples show how to invoke methods.
+You can invoke methods by using typical Java programming syntax. You can also invoke methods
+on literals. Variable arguments are also supported. The following examples show how to
+invoke methods:

 [tabs]
 ======
@@ -1,151 +0,0 @@
-[[expressions-varargs]]
-= Varargs Invocations
-
-The Spring Expression Language supports
-https://docs.oracle.com/javase/8/docs/technotes/guides/language/varargs.html[varargs]
-invocations for xref:core/expressions/language-ref/constructors.adoc[constructors],
-xref:core/expressions/language-ref/methods.adoc[methods], and user-defined
-xref:core/expressions/language-ref/functions.adoc[functions].
-
-The following example shows how to invoke the `java.lang.String#formatted(Object...)`
-_varargs_ method within an expression by supplying the variable argument list as separate
-arguments (`'blue', 1`).
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
----
-	// evaluates to "blue is color #1"
-	String expression = "'%s is color #%d'.formatted('blue', 1)";
-	String message = parser.parseExpression(expression).getValue(String.class);
----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
----
-	// evaluates to "blue is color #1"
-	val expression = "'%s is color #%d'.formatted('blue', 1)"
-	val message = parser.parseExpression(expression).getValue(String::class.java)
----
-======
-
-A variable argument list can also be supplied as an array, as demonstrated in the
-following example (`new Object[] {'blue', 1}`).
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
----
-	// evaluates to "blue is color #1"
-	String expression = "'%s is color #%d'.formatted(new Object[] {'blue', 1})";
-	String message = parser.parseExpression(expression).getValue(String.class);
----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
----
-	// evaluates to "blue is color #1"
-	val expression = "'%s is color #%d'.formatted(new Object[] {'blue', 1})"
-	val message = parser.parseExpression(expression).getValue(String::class.java)
----
-======
-
-As an alternative, a variable argument list can be supplied as a `java.util.List` – for
-example, as an xref:core/expressions/language-ref/inline-lists.adoc[inline list]
-(`{'blue', 1}`). The following example shows how to do that.
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
----
-	// evaluates to "blue is color #1"
-	String expression = "'%s is color #%d'.formatted({'blue', 1})";
-	String message = parser.parseExpression(expression).getValue(String.class);
----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
----
-	// evaluates to "blue is color #1"
-	val expression = "'%s is color #%d'.formatted({'blue', 1})"
-	val message = parser.parseExpression(expression).getValue(String::class.java)
----
-======
-
-[[expressions-varargs-type-conversion]]
-== Varargs Type Conversion
-
-In contrast to the standard support for varargs invocations in Java,
-xref:core/expressions/evaluation.adoc#expressions-type-conversion[type conversion] may be
-applied to the individual arguments when invoking varargs constructors, methods, or
-functions in SpEL.
-
-For example, if we have registered a custom
-xref:core/expressions/language-ref/functions.adoc[function] in the `EvaluationContext`
-under the name `#reverseStrings` for a method with the signature
-`String reverseStrings(String... strings)`, we can invoke that function within a SpEL
-expression with any argument that can be converted to a `String`, as demonstrated in the
-following example.
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
----
-	// evaluates to "3.0, 2.0, 1, SpEL"
-	String expression = "#reverseStrings('SpEL', 1, 10F / 5, 3.0000)";
-	String message = parser.parseExpression(expression)
-			.getValue(evaluationContext, String.class);
----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
----
-	// evaluates to "3.0, 2.0, 1, SpEL"
-	val expression = "#reverseStrings('SpEL', 1, 10F / 5, 3.0000)"
-	val message = parser.parseExpression(expression)
-			.getValue(evaluationContext, String::class.java)
----
-======
-
-Similarly, any array whose component type is a subtype of the required varargs type can
-be supplied as the variable argument list for a varargs invocation. For example, a
-`String[]` array can be supplied to a varargs invocation that accepts an `Object...`
-argument list.
-
-The following listing demonstrates that we can supply a `String[]` array to the
-`java.lang.String#formatted(Object...)` _varargs_ method. It also highlights that `1`
-will be automatically converted to `"1"`.
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
----
-	// evaluates to "blue is color #1"
-	String expression = "'%s is color #%s'.formatted(new String[] {'blue', 1})";
-	String message = parser.parseExpression(expression).getValue(String.class);
----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes"]
----
-	// evaluates to "blue is color #1"
-	val expression = "'%s is color #%s'.formatted(new String[] {'blue', 1})"
-	val message = parser.parseExpression(expression).getValue(String::class.java)
----
-======
-
@@ -1,184 +1,57 @@
 [[null-safety]]
 = Null-safety

-Although Java does not let you express null-safety with its type system, the Spring Framework codebase is annotated with
-https://jspecify.dev/docs/start-here/[JSpecify] annotations to declare the nullness of APIs, fields and related type
-usages. Reading the https://jspecify.dev/docs/user-guide/[JSpecify user guide] is highly recommended in order to get
-familiar with those annotations and semantics.
+Although Java does not let you express null-safety with its type system, the Spring Framework
+provides the following annotations in the `org.springframework.lang` package to let you
+declare nullability of APIs and fields:

-The primary goal of this explicit null-safety arrangement is to prevent `NullPointerException` to be thrown at runtime via
-build time checks and to turn explicit nullness into a way to express the possible absence of value. It is useful in
-both Java by leveraging some tooling (https://github.com/uber/NullAway[NullAway] or IDEs supporting null-safety
-annotations such as IntelliJ IDEA or Eclipse) and Kotlin where JSpecify annotations are automatically translated to
-{kotlin-docs}/null-safety.html[Kotlin's null safety].
+* {spring-framework-api}/lang/Nullable.html[`@Nullable`]: Annotation to indicate that a
+specific parameter, return value, or field can be `null`.
+* {spring-framework-api}/lang/NonNull.html[`@NonNull`]: Annotation to indicate that a specific
+parameter, return value, or field cannot be `null` (not needed on parameters, return values,
+and fields where `@NonNullApi` and `@NonNullFields` apply, respectively).
+* {spring-framework-api}/lang/NonNullApi.html[`@NonNullApi`]: Annotation at the package level
+that declares non-null as the default semantics for parameters and return values.
+* {spring-framework-api}/lang/NonNullFields.html[`@NonNullFields`]: Annotation at the package
+level that declares non-null as the default semantics for fields.

-The {spring-framework-api}/core/Nullness.html[`Nullness` Spring API] can be used at runtime to detect the nullness of a
-type usage, a field, a method return type or a parameter. It provides full support for JSpecify annotations,
-Kotlin null safety, Java primitive types, as well as a pragmatic check on any `@Nullable` annotation (regardless of the
-package).
+The Spring Framework itself leverages these annotations, but they can also be used in any
+Spring-based Java project to declare null-safe APIs and optionally null-safe fields.
+Nullability declarations for generic type arguments, varargs, and array elements are not supported yet.
+Nullability declarations are expected to be fine-tuned between Spring Framework releases,
+including minor ones. Nullability of types used inside method bodies is outside the
+scope of this feature.

-[[null-safety-libraries]]
-== Annotating libraries with JSpecify annotations
-
-As of Spring Framework 7, the Spring Framework codebase leverages JSpecify annotations to expose null-safe APIs and
-to check the consistency of those null-safety declarations with https://github.com/uber/NullAway[NullAway] as part of
-its build. It is recommended for each library depending on Spring Framework (Spring portfolio projects), as
-well as other libraries related to the Spring ecosystem (Reactor, Micrometer and Spring community projects), to do the
-same.
-
-[[null-safety-applications]]
-== Leveraging JSpecify annotations in Spring applications
-
-Developing applications with IDEs supporting null-safety annotations, such as IntelliJ IDEA or Eclipse, will provide
-warnings in Java and errors in Kotlin when the null-safety contracts are not honored, allowing Spring application
-developers to refine their null handling to prevent `NullPointerException` to be thrown at runtime.
-
-Optionally, Spring application developers can annotate their codebase and use https://github.com/uber/NullAway[NullAway]
-to enforce null-safety during build time at application level.
-
-[[null-safety-guidelines]]
-== Guidelines
-
-The purpose of this section is to share some guidelines proposed for specifying explicitly the nullness of Spring-related
-libraries or applications.
+NOTE: Other common libraries such as Reactor and Spring Data provide null-safe APIs that
+use a similar nullability arrangement, delivering a consistent overall experience for
+Spring application developers.


-[[null-safety-guidelines-jpecify]]
-=== JSpecify
-
-The key points to understand is that by default, the nullness of types is unknown in Java, and that non-null type
-usages are by far more frequent than nullable ones. In order to keep codebases readable, we typically want to define
-that by default, type usages are non-null unless marked as nullable for a specific scope. This is exactly the purpose of
-https://jspecify.dev/docs/api/org/jspecify/annotations/NullMarked.html[`@NullMarked`] that is typically set with Spring
-at package level via a `package-info.java` file, for example:
-
-[source,java,subs="verbatim,quotes",chomp="-packages",fold="none"]
----
-@NullMarked
-package org.springframework.core;
-
-import org.jspecify.annotations.NullMarked;
----
-
-In the various Java files belonging to the package, nullable type usages are defined explicitly with
-https://jspecify.dev/docs/api/org/jspecify/annotations/Nullable.html[`@Nullable`]. It is recommended that this
-annotation is specified just before the related type.
-
-For example, for a field:
-
-[source,java,subs="verbatim,quotes"]
----
-private @Nullable String fileEncoding;
----
-
-Or for method parameters and return value:
-
-[source,java,subs="verbatim,quotes"]
----
-public static @Nullable String buildMessage(@Nullable String message,
-                                            @Nullable Throwable cause) {
-    // ...
-}
----
-
-When overriding a method, nullness annotations are not inherited from the superclass method. That means those
-nullness annotations should be repeated if you just want to override the implementation and keep the same API
-nullness.
-
-With arrays and varargs, you need to be able to differentiate the nullness of the elements from the nullness of
-the array itself. Pay attention to the syntax
-https://docs.oracle.com/javase/specs/jls/se17/html/jls-9.html#jls-9.7.4[defined by the Java specification] which may be
-initially surprising:
-
- `@Nullable Object[] array` means individual elements can be null but the array itself can't.
- `Object @Nullable [] array` means individual elements can't be null but the array itself can.
- `@Nullable Object @Nullable [] array` means both individual elements and the array can be null.
-
-The Java specifications also enforces that annotations defined with `@Target(ElementType.TYPE_USE)` like JSpecify
-`@Nullable` should be specified after the last `.` with inner or fully qualified types:
-
- - `Cache.@Nullable ValueWrapper`
- - `jakarta.validation.@Nullable Validator`
-
-https://jspecify.dev/docs/api/org/jspecify/annotations/NonNull.html[`@NonNull`] and
-https://jspecify.dev/docs/api/org/jspecify/annotations/NullUnmarked.html[`@NullUnmarked`] should rarely be needed for
-typical use cases.
-
-[[null-safety-guidelines-nullaway]]
-=== NullAway
-
-==== Configuration
-
-The recommended configuration is:
-
- - `NullAway:OnlyNullMarked=true` in order to perform nullness checks only for packages annotated with `@NullMarked`.
- - `NullAway:CustomContractAnnotations=org.springframework.lang.Contract` which makes NullAway aware of the
-{spring-framework-api}/lang/Contract.html[@Contract] annotation in the `org.springframework.lang` package which
-can be used to express complementary semantics to avoid non-relevant null-safety warnings in your codebase.
-
-A good example of `@Contract` benefits is
-{spring-framework-api}/util/Assert.html#notNull(java.lang.Object,java.lang.String)[`Assert#notnull`] which is annotated
-with `@Contract("null, _ -> fail")`. With the configuration above, NullAway will understand that after a successful
-invocation, the value passed as a parameter is not null.
-
-Optionally, it is possible to set `NullAway:JSpecifyMode=true` to enable
-https://github.com/uber/NullAway/wiki/JSpecify-Support[checks on the full JSpecify semantics], including annotations on
-generic types. Be aware that this mode is
-https://github.com/uber/NullAway/issues?q=is%3Aissue+is%3Aopen+label%3Ajspecify[still under development] and requires
-using JDK 22 or later (typically combined with the `--release` Java compiler flag to configure the
-expected baseline). It is recommended to enable the JSpecify mode only as a second step, after making sure the codebase
-generates no warning with the recommended configuration mentioned above.
-
-==== Warnings suppression
-
-There are a few valid use cases where NullAway will wrongly detect nullness problems. In such case, it is recommended
-to suppress related warnings and to document the reason:
-
- - `@SuppressWarnings("NullAway.Init")` at field, constructor or class level can be used to avoid unnecessary warnings
-due to the lazy initialization of fields, for example due to a class implementing
-{spring-framework-api}/beans/factory/InitializingBean.html[`InitializingBean`].
- - `@SuppressWarnings("NullAway") // Dataflow analysis limitation` can be used when NullAway dataflow analysis is not
-able to detect that the path involving a nullness problem will never happen.
- - `@SuppressWarnings("NullAway") // Lambda` can be used when NullAway does not take into account assertions performed
-outside of a lambda for the code path within the lambda.
- `@SuppressWarnings("NullAway") // Reflection` can be used for some reflection operations that are known returning
-non-null values even if that can't be expressed by the API.
- `@SuppressWarnings("NullAway") // Well-known map keys` can be used when `Map#get` invocations are done with keys known
-to be present and non-null related values inserted previously.
- `@SuppressWarnings("NullAway") // Overridden method does not define nullness` can be used when the super class does
-not define nullness (typically when the super class is coming from a dependency).


-[[null-safety-migrating]]
-== Migrating from Spring null-safety annotations
+[[use-cases]]
+== Use cases

-Spring null-safety annotations {spring-framework-api}/lang/Nullable.html[`@Nullable`],
-{spring-framework-api}/lang/NonNull.html[`@NonNull`],
-{spring-framework-api}/lang/NonNullApi.html[`@NonNullApi`], and
-{spring-framework-api}/lang/NonNullFields.html[`@NonNullFields`] in the `org.springframework.lang` package have been
-introduced in Spring Framework 5 when JSpecify did not exist and the best option was to leverage JSR 305 (a dormant
-but widespread JSR) meta-annotations. They are deprecated as of Spring Framework 7 in favor of
-https://jspecify.dev/docs/start-here/[JSpecify] annotations, which provide significant enhancements such as properly
-defined specifications, a canonical dependency with no split-package issue, better tooling, better Kotlin integration
-and the capability to specify the nullness more precisely for more use cases.
+In addition to providing an explicit declaration for Spring Framework API nullability,
+these annotations can be used by an IDE (such as IDEA or Eclipse) to provide useful
+warnings related to null-safety in order to avoid `NullPointerException` at runtime.

-A key difference is that Spring null-safety annotations, following JSR 305 semantics, apply to fields,
-parameters and return values while JSpecify annotations apply to type usages. This subtle difference
-is in practice pretty significant, as it allows for example to differentiate the nullness of elements from the
-nullness of arrays/varargs as well as defining the nullness of generic types.
+They are also used to make Spring APIs null-safe in Kotlin projects, since Kotlin natively
+supports {kotlin-docs}/null-safety.html[null-safety]. More details
+are available in the xref:languages/kotlin/null-safety.adoc[Kotlin support documentation].

-That means array and varargs null-safety declarations have to be updated to keep the same semantic. For example
-`@Nullable Object[] array` with Spring annotations needs to be changed to `Object @Nullable [] array` with JSpecify
-annotations. Same for varargs.

-It is also recommended to move field and return value annotations closer to the type, for example:

- - For fields, instead of `@Nullable private String field` with Spring annotations, use `private @Nullable String field`
-with JSpecify annotations.
- For return values, instead of `@Nullable public String method()` with Spring annotations, use
-`public @Nullable String method()` with JSpecify annotations.

-Also, with JSpecify, you don't need to specify `@NonNull` when overriding a type usage annotated with `@Nullable` in the
-super method to "undo" the nullable declaration in null-marked code. Just declare it unannotated and the null-marked
-defaults (a type usage is considered non-null unless explicitly annotated as nullable) will apply.
+[[jsr-305-meta-annotations]]
+== JSR-305 meta-annotations

+Spring annotations are meta-annotated with {JSR}305[JSR 305]
+annotations (a dormant but widespread JSR). JSR-305 meta-annotations let tooling vendors
+like IDEA or Kotlin provide null-safety support in a generic way, without having to
+hard-code support for Spring annotations.
+
+It is neither necessary nor recommended to add a JSR-305 dependency to the project classpath to
+take advantage of Spring's null-safe APIs. Only projects such as Spring-based libraries that use
+null-safety annotations in their codebase should add `com.google.code.findbugs:jsr305:3.0.2`
+with `compileOnly` Gradle configuration or Maven `provided` scope to avoid compiler warnings.
@@ -0,0 +1,47 @@
+[[spring-jcl]]
+= Logging
+
+Spring comes with its own Commons Logging bridge implemented
+in the `spring-jcl` module. The implementation checks for the presence of the Log4j 2.x
+API and the SLF4J 1.7 API in the classpath and uses the first one of those found as the
+logging implementation, falling back to the Java platform's core logging facilities (also
+known as _JUL_ or `java.util.logging`) if neither Log4j 2.x nor SLF4J is available.
+
+Put Log4j 2.x or Logback (or another SLF4J provider) in your classpath, without any extra
+bridges, and let the framework auto-adapt to your choice. For further information see the
+{spring-boot-docs-ref}/features/logging.html[Spring
+Boot Logging Reference Documentation].
+
+[NOTE]
+====
+Spring's Commons Logging variant is only meant to be used for infrastructure logging
+purposes in the core framework and in extensions.
+
+For logging needs within application code, prefer direct use of Log4j 2.x, SLF4J, or JUL.
+====
+
+A `Log` implementation may be retrieved via `org.apache.commons.logging.LogFactory` as in
+the following example.
+
+[tabs]
+======
+Java::
+
+[source,java,indent=0,subs="verbatim,quotes"]
+----
+public class MyBean {
+	private final Log log = LogFactory.getLog(getClass());
+    // ...
+}
+----
+
+Kotlin::
+
+[source,kotlin,indent=0,subs="verbatim,quotes"]
+----
+class MyBean {
+  private val log = LogFactory.getLog(javaClass)
+  // ...
+}
+----
+======
@@ -7,7 +7,7 @@ xref:overview.adoc[Overview] :: History, Design Philosophy, Feedback,
 Getting Started.
 xref:core.adoc[Core] :: IoC Container, Events, Resources, i18n,
 Validation, Data Binding, Type Conversion, SpEL, AOP, AOT.
-xref:testing.adoc[Testing] :: Mock Objects, TestContext Framework,
+<<testing.adoc#testing, Testing>> :: Mock Objects, TestContext Framework,
 Spring MVC Test, WebTestClient.
 xref:data-access.adoc[Data Access] :: Transactions, DAO Support,
 JDBC, R2DBC, O/R Mapping, XML Marshalling.
@@ -11,7 +11,9 @@ Spring Framework's email support:
 * The https://jakartaee.github.io/mail-api/[Jakarta Mail] library

 This library is freely available on the web -- for example, in Maven Central as
-`org.eclipse.angus:angus-mail`.
+`com.sun.mail:jakarta.mail`. Please make sure to use the latest 2.x version (which uses
+the `jakarta.mail` package namespace) rather than Jakarta Mail 1.6.x (which uses the
+`javax.mail` package namespace).
 ****

 The Spring Framework provides a helpful utility library for sending email that shields
@@ -6,7 +6,7 @@ the same way as Spring's integration does for the JDBC API.

 JMS can be roughly divided into two areas of functionality, namely the production and
 consumption of messages. The `JmsTemplate` class is used for message production and
-synchronous message receipt. For asynchronous receipt similar to Jakarta EE's
+synchronous message reception. For asynchronous reception similar to Jakarta EE's
 message-driven bean style, Spring provides a number of message-listener containers that
 you can use to create Message-Driven POJOs (MDPs). Spring also provides a declarative way
 to create message listeners.
@@ -5,7 +5,7 @@ This describes how to receive messages with JMS in Spring.


 [[jms-receiving-sync]]
-== Synchronous Receipt
+== Synchronous Reception

 While JMS is typically associated with asynchronous processing, you can
 consume messages synchronously. The overloaded `receive(..)` methods provide this
@@ -16,11 +16,11 @@ the receiver should wait before giving up waiting for a message.


 [[jms-receiving-async]]
-== Asynchronous Receipt: Message-Driven POJOs
+== Asynchronous reception: Message-Driven POJOs

 NOTE: Spring also supports annotated-listener endpoints through the use of the `@JmsListener`
-annotation and provides open infrastructure to register endpoints programmatically.
-This is, by far, the most convenient way to set up an asynchronous receiver.
+annotation and provides an open infrastructure to register endpoints programmatically.
+This is, by far, the most convenient way to setup an asynchronous receiver.
 See xref:integration/jms/annotated.adoc#jms-annotated-support[Enable Listener Endpoint Annotations] for more details.

 In a fashion similar to a Message-Driven Bean (MDB) in the EJB world, the Message-Driven
@@ -154,7 +154,7 @@ listener container.

 You can activate local resource transactions through the `sessionTransacted` flag
 on the listener container definition. Each message listener invocation then operates
-within an active JMS transaction, with message receipt rolled back in case of listener
+within an active JMS transaction, with message reception rolled back in case of listener
 execution failure. Sending a response message (through `SessionAwareMessageListener`) is
 part of the same local transaction, but any other resource operations (such as
 database access) operate independently. This usually requires duplicate message
@@ -173,7 +173,7 @@ To configure a message listener container for XA transaction participation, you
 to configure a `JtaTransactionManager` (which, by default, delegates to the Jakarta EE
 server's transaction subsystem). Note that the underlying JMS `ConnectionFactory` needs to
 be XA-capable and properly registered with your JTA transaction coordinator. (Check your
-Jakarta EE server's configuration of JNDI resources.) This lets message receipt as well
+Jakarta EE server's configuration of JNDI resources.) This lets message reception as well
 as (for example) database access be part of the same transaction (with unified commit
 semantics, at the expense of XA transaction log overhead).

@@ -167,15 +167,13 @@ operations that do not refer to a specific destination.

 One of the most common uses of JMS messages in the EJB world is to drive message-driven
 beans (MDBs). Spring offers a solution to create message-driven POJOs (MDPs) in a way
-that does not tie a user to an EJB container. (See
-xref:integration/jms/receiving.adoc#jms-receiving-async[Asynchronous Receipt: Message-Driven POJOs]
-for detailed coverage of Spring's MDP support.) Endpoint methods can be annotated with
-`@JmsListener` -- see xref:integration/jms/annotated.adoc[Annotation-driven Listener Endpoints]
-for more details.
+that does not tie a user to an EJB container. (See xref:integration/jms/receiving.adoc#jms-receiving-async[Asynchronous reception: Message-Driven POJOs] for detailed
+coverage of Spring's MDP support.) Since Spring Framework 4.1, endpoint methods can be
+annotated with `@JmsListener` -- see xref:integration/jms/annotated.adoc[Annotation-driven Listener Endpoints] for more details.

 A message listener container is used to receive messages from a JMS message queue and
 drive the `MessageListener` that is injected into it. The listener container is
-responsible for all threading of message receipt and dispatches into the listener for
+responsible for all threading of message reception and dispatches into the listener for
 processing. A message listener container is the intermediary between an MDP and a
 messaging provider and takes care of registering to receive messages, participating in
 transactions, resource acquisition and release, exception conversion, and so on. This
@@ -229,7 +227,7 @@ the JMS provider, advanced functionality (such as participation in externally ma
 transactions), and compatibility with Jakarta EE environments.

 You can customize the cache level of the container. Note that, when no caching is enabled,
-a new connection and a new session is created for each message receipt. Combining this
+a new connection and a new session is created for each message reception. Combining this
 with a non-durable subscription with high loads may lead to message loss. Make sure to
 use a proper cache level in such a case.

@@ -248,7 +246,7 @@ in the form of a business entity existence check or a protocol table check.
 Any such arrangements are significantly more efficient than the alternative:
 wrapping your entire processing with an XA transaction (through configuring your
 `DefaultMessageListenerContainer` with an `JtaTransactionManager`) to cover the
-receipt of the JMS message as well as the execution of the business logic in your
+reception of the JMS message as well as the execution of the business logic in your
 message listener (including database operations, etc.).

 IMPORTANT: The default `AUTO_ACKNOWLEDGE` mode does not provide proper reliability guarantees.
@@ -37,7 +37,7 @@ As outlined xref:integration/observability.adoc[at the beginning of this section
 |Processing time for an execution of a `@Scheduled` task
 |===

-NOTE: Observations use Micrometer's official naming convention, but Metrics names will be automatically converted
+NOTE: Observations are using Micrometer's official naming convention, but Metrics names will be automatically converted
 {micrometer-docs}/concepts/naming.html[to the format preferred by the monitoring system backend]
 (Prometheus, Atlas, Graphite, InfluxDB...).

@@ -97,7 +97,7 @@ This can be done by declaring a `SchedulingConfigurer` bean that sets the observ

 include-code::./ObservationSchedulingConfigurer[]

-It uses the `org.springframework.scheduling.support.DefaultScheduledTaskObservationConvention` by default, backed by the `ScheduledTaskObservationContext`.
+It is using the `org.springframework.scheduling.support.DefaultScheduledTaskObservationConvention` by default, backed by the `ScheduledTaskObservationContext`.
 You can configure a custom implementation on the `ObservationRegistry` directly.
 During the execution of the scheduled method, the current observation is restored in the `ThreadLocal` context or the Reactor context (if the scheduled method returns a `Mono` or `Flux` type).

@@ -107,7 +107,7 @@ By default, the following `KeyValues` are created:
 [cols="a,a"]
 |===
 |Name | Description
-|`code.function` _(required)_|Name of the Java `Method` that is scheduled for execution.
+|`code.function` _(required)_|Name of Java `Method` that is scheduled for execution.
 |`code.namespace` _(required)_|Canonical name of the class of the bean instance that holds the scheduled method, or `"ANONYMOUS"` for anonymous classes.
 |`error` _(required)_|Class name of the exception thrown during the execution, or `"none"` if no exception happened.
 |`exception` _(deprecated)_|Duplicates the `error` key and might be removed in the future.
@@ -126,7 +126,7 @@ This instrumentation will create 2 types of observations:
 * `"jms.message.publish"` when a JMS message is sent to the broker, typically with `JmsTemplate`.
 * `"jms.message.process"` when a JMS message is processed by the application, typically with a `MessageListener` or a `@JmsListener` annotated method.

-NOTE: Currently there is no instrumentation for `"jms.message.receive"` observations as there is little value in measuring the time spent waiting for the receipt of a message.
+NOTE: currently there is no instrumentation for `"jms.message.receive"` observations as there is little value in measuring the time spent waiting for the reception of a message.
 Such an integration would typically instrument `MessageConsumer#receive` method calls. But once those return, the processing time is not measured and the trace scope cannot be propagated to the application.

 By default, both observations share the same set of possible `KeyValues`:
@@ -138,7 +138,7 @@ By default, both observations share the same set of possible `KeyValues`:
 |`error` |Class name of the exception thrown during the messaging operation (or "none").
 |`exception` _(deprecated)_|Duplicates the `error` key and might be removed in the future.
 |`messaging.destination.temporary` _(required)_|Whether the destination is a `TemporaryQueue` or `TemporaryTopic` (values: `"true"` or `"false"`).
-|`messaging.operation` _(required)_|Name of the JMS operation being performed (values: `"publish"` or `"process"`).
+|`messaging.operation` _(required)_|Name of JMS operation being performed (values: `"publish"` or `"process"`).
 |===

 .High cardinality Keys
@@ -146,7 +146,7 @@ By default, both observations share the same set of possible `KeyValues`:
 |===
 |Name | Description
 |`messaging.message.conversation_id` |The correlation ID of the JMS message.
-|`messaging.destination.name` |The name of the destination the current message was sent to.
+|`messaging.destination.name` |The name of destination the current message was sent to.
 |`messaging.message.id` |Value used by the messaging system as an identifier for the message.
 |===

@@ -213,7 +213,7 @@ By default, the following `KeyValues` are created:
 |Name | Description
 |`error` _(required)_|Class name of the exception thrown during the exchange, or `"none"` if no exception happened.
 |`exception` _(deprecated)_|Duplicates the `error` key and might be removed in the future.
-|`method` _(required)_|Name of the HTTP request method or `"none"` if not a well-known method.
+|`method` _(required)_|Name of HTTP request method or `"none"` if not a well-known method.
 |`outcome` _(required)_|Outcome of the HTTP server exchange.
 |`status` _(required)_|HTTP response raw status code, or `"UNKNOWN"` if no response was created.
 |`uri` _(required)_|URI pattern for the matching handler if available, falling back to `REDIRECTION` for 3xx responses, `NOT_FOUND` for 404 responses, `root` for requests with no path info, and `UNKNOWN` for all other requests.
@@ -235,10 +235,10 @@ This can be done on the `WebHttpHandlerBuilder`, as follows:

 include-code::./HttpHandlerConfiguration[]

-It uses the `org.springframework.http.server.reactive.observation.DefaultServerRequestObservationConvention` by default, backed by the `ServerRequestObservationContext`.
+It is using the `org.springframework.http.server.reactive.observation.DefaultServerRequestObservationConvention` by default, backed by the `ServerRequestObservationContext`.

 This will only record an observation as an error if the `Exception` has not been handled by an application Controller.
-Typically, all exceptions handled by Spring WebFlux's `@ExceptionHandler` and xref:web/webflux/ann-rest-exceptions.adoc[`ProblemDetail` support] will not be recorded with the observation.
+Typically, all exceptions handled by Spring WebFlux's `@ExceptionHandler` and <<web.adoc#webflux-ann-rest-exceptions,`ProblemDetail` support>> will not be recorded with the observation.
 You can, at any point during request processing, set the error field on the `ObservationContext` yourself:

 include-code::./UserController[]
@@ -251,7 +251,7 @@ By default, the following `KeyValues` are created:
 |Name | Description
 |`error` _(required)_|Class name of the exception thrown during the exchange, or `"none"` if no exception happened.
 |`exception` _(deprecated)_|Duplicates the `error` key and might be removed in the future.
-|`method` _(required)_|Name of the HTTP request method or `"none"` if not a well-known method.
+|`method` _(required)_|Name of HTTP request method or `"none"` if not a well-known method.
 |`outcome` _(required)_|Outcome of the HTTP server exchange.
 |`status` _(required)_|HTTP response raw status code, or `"UNKNOWN"` if no response was created.
 |`uri` _(required)_|URI pattern for the matching handler if available, falling back to `REDIRECTION` for 3xx responses, `NOT_FOUND` for 404 responses, `root` for requests with no path info, and `UNKNOWN` for all other requests.
@@ -270,7 +270,6 @@ By default, the following `KeyValues` are created:
 == HTTP Client Instrumentation

 HTTP client exchange observations are created with the name `"http.client.requests"` for blocking and reactive clients.
-This observation measures the entire HTTP request/response exchange, from connection establishment up to body deserialization.
 Unlike their server counterparts, the instrumentation is implemented directly in the client so the only required step is to configure an `ObservationRegistry` on the client.

 [[observability.http-client.resttemplate]]
@@ -285,8 +284,8 @@ Instrumentation uses the `org.springframework.http.client.observation.ClientRequ
 [cols="a,a"]
 |===
 |Name | Description
-|`method` _(required)_|Name of the HTTP request method or `"none"` if not a well-known method.
-|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. The protocol, host and port part of the URI are not considered.
+|`method` _(required)_|Name of HTTP request method or `"none"` if not a well-known method.
+|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. Only the path part of the URI is considered.
 |`client.name` _(required)_|Client name derived from the request URI host.
 |`status` _(required)_|HTTP response raw status code, or `"IO_ERROR"` in case of `IOException`, or `"CLIENT_ERROR"` if no response was received.
 |`outcome` _(required)_|Outcome of the HTTP client exchange.
@@ -313,8 +312,8 @@ Instrumentation uses the `org.springframework.http.client.observation.ClientRequ
 [cols="a,a"]
 |===
 |Name | Description
-|`method` _(required)_|Name of the HTTP request method or `"none"` if the request could not be created.
-|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. The protocol, host and port part of the URI are not considered.
+|`method` _(required)_|Name of HTTP request method or `"none"` if the request could not be created.
+|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. Only the path part of the URI is considered.
 |`client.name` _(required)_|Client name derived from the request URI host.
 |`status` _(required)_|HTTP response raw status code, or `"IO_ERROR"` in case of `IOException`, or `"CLIENT_ERROR"` if no response was received.
 |`outcome` _(required)_|Outcome of the HTTP client exchange.
@@ -333,7 +332,7 @@ Instrumentation uses the `org.springframework.http.client.observation.ClientRequ
 [[observability.http-client.webclient]]
 === WebClient

-Applications must configure an `ObservationRegistry` on the `WebClient.Builder` to enable the instrumentation; without that, observations are "no-ops".
+Applications must configure an `ObservationRegistry` on the `WebClient` builder to enable the instrumentation; without that, observations are "no-ops".
 Spring Boot will auto-configure `WebClient.Builder` beans with the observation registry already set.

 Instrumentation uses the `org.springframework.web.reactive.function.client.ClientRequestObservationConvention` by default, backed by the `ClientRequestObservationContext`.
@@ -342,8 +341,8 @@ Instrumentation uses the `org.springframework.web.reactive.function.client.Clien
 [cols="a,a"]
 |===
 |Name | Description
-|`method` _(required)_|Name of the HTTP request method or `"none"` if not a well-known method.
-|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. The protocol, host and port part of the URI are not considered.
+|`method` _(required)_|Name of HTTP request method or `"none"` if not a well-known method.
+|`uri` _(required)_|URI template used for HTTP request, or `"none"` if none was provided. Only the path part of the URI is considered.
 |`client.name` _(required)_|Client name derived from the request URI host.
 |`status` _(required)_|HTTP response raw status code, or `"IO_ERROR"` in case of `IOException`, or `"CLIENT_ERROR"` if no response was received.
 |`outcome` _(required)_|Outcome of the HTTP client exchange.
@@ -938,10 +938,10 @@ method parameters:
 | Dynamically set the HTTP method for the request, overriding the annotation's `method` attribute

 | `@RequestHeader`
-| Add a request header or multiple headers. The argument may be a single value,
-  a `Collection<?>` of values, `Map<String, ?>`,`MultiValueMap<String, ?>`.
-  Type conversion is supported for non-String values. Header values are added and
-  do not override already added header values.
+| Add a request header or multiple headers. The argument may be a `Map<String, ?>` or
+  `MultiValueMap<String, ?>` with multiple headers, a `Collection<?>` of values, or an
+  individual value. Type conversion is supported for non-String values. This overrides
+  the annotation's `headers` attribute.

 | `@PathVariable`
 | Add a variable for expand a placeholder in the request URL. The argument may be a
@@ -988,27 +988,6 @@ parameter annotation) is set to `false`, or the parameter is marked optional as



-[[rest-http-interface.custom-resolver]]
-=== Custom argument resolver
-
-For more complex cases, HTTP interfaces do not support `RequestEntity` types as method parameters.
-This would take over the entire HTTP request and not improve the semantics of the interface.
-Instead of adding many method parameters, developers can combine them into a custom type
-and configure a dedicated `HttpServiceArgumentResolver` implementation.
-
-In the following HTTP interface, we are using a custom `Search` type as a parameter:
-
-include-code::./CustomHttpServiceArgumentResolver[tag=httpinterface,indent=0]
-
-We can implement our own `HttpServiceArgumentResolver` that supports our custom `Search` type
-and writes its data in the outgoing HTTP request.
-
-include-code::./CustomHttpServiceArgumentResolver[tag=argumentresolver,indent=0]
-
-Finally, we can use this argument resolver during the setup and use our HTTP interface.
-
-include-code::./CustomHttpServiceArgumentResolver[tag=usage,indent=0]
-
 [[rest-http-interface-return-values]]
 === Return Values

@@ -14,13 +14,16 @@ For example, `@Autowired lateinit var thing: Thing` implies that a bean
 of type `Thing` must be registered in the application context, while `@Autowired lateinit var thing: Thing?`
 does not raise an error if such a bean does not exist.

-Following the same principle, `@Bean fun play(toy: Toy, car: Car?) = Baz(toy, car)` implies
+Following the same principle, `@Bean fun play(toy: Toy, car: Car?) = Baz(toy, Car)` implies
 that a bean of type `Toy` must be registered in the application context, while a bean of
 type `Car` may or may not exist. The same behavior applies to autowired constructor parameters.

 NOTE: If you use bean validation on classes with properties or a primary constructor
-with parameters, you may need to use
+parameters, you may need to use
 {kotlin-docs}/annotations.html#annotation-use-site-targets[annotation use-site targets],
 such as `@field:NotNull` or `@get:Size(min=5, max=15)`, as described in
 {stackoverflow-site}/a/35853200/1092077[this Stack Overflow response].

+
+
+
@@ -5,11 +5,34 @@ One of Kotlin's key features is {kotlin-docs}/null-safety.html[null-safety],
 which cleanly deals with `null` values at compile time rather than bumping into the famous
 `NullPointerException` at runtime. This makes applications safer through nullability
 declarations and expressing "`value or no value`" semantics without paying the cost of wrappers, such as `Optional`.
-Kotlin allows using functional constructs with nullable values. See this
-{baeldung-blog}/kotlin-null-safety[comprehensive guide to Kotlin null-safety].
+(Kotlin allows using functional constructs with nullable values. See this
+{baeldung-blog}/kotlin-null-safety[comprehensive guide to Kotlin null-safety].)

 Although Java does not let you express null-safety in its type-system, the Spring Framework
-provides xref:core/null-safety.adoc[null-safety of the whole Spring Framework API]
-via tooling-friendly https://jspecify.dev/[JSpecify] annotations.
+provides xref:languages/kotlin/null-safety.adoc[null-safety of the whole Spring Framework API]
+via tooling-friendly annotations declared in the `org.springframework.lang` package.
+By default, types from Java APIs used in Kotlin are recognized as
+{kotlin-docs}/java-interop.html#null-safety-and-platform-types[platform types],
+for which null-checks are relaxed.
+{kotlin-docs}/java-interop.html#jsr-305-support[Kotlin support for JSR-305 annotations]
+and Spring nullability annotations provide null-safety for the whole Spring Framework API to Kotlin developers,
+with the advantage of dealing with `null`-related issues at compile time.
+
+NOTE: Libraries such as Reactor or Spring Data provide null-safe APIs to leverage this feature.
+
+You can configure JSR-305 checks by adding the `-Xjsr305` compiler flag with the following
+options: `-Xjsr305={strict|warn|ignore}`.
+
+For kotlin versions 1.1+, the default behavior is the same as `-Xjsr305=warn`.
+The `strict` value is required to have Spring Framework API null-safety taken into account
+in Kotlin types inferred from Spring API but should be used with the knowledge that Spring
+API nullability declaration could evolve even between minor releases and that more checks may
+be added in the future.
+
+NOTE: Generic type arguments, varargs, and array elements nullability are not supported yet,
+but should be in an upcoming release. See {kotlin-github-org}/KEEP/issues/79[this discussion]
+for up-to-date information.
+
+
+

-As of Kotlin 2.1, Kotlin enforces strict handling of nullability annotations from `org.jspecify.annotations` package.
@@ -2,7 +2,7 @@
 = Requirements
 :page-section-summary-toc: 1

-Spring Framework supports Kotlin 2.1+ and requires
+Spring Framework supports Kotlin 1.7+ and requires
 https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-stdlib[`kotlin-stdlib`]
 and https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-reflect[`kotlin-reflect`]
 to be present on the classpath. They are provided by default if you bootstrap a Kotlin project on
@@ -75,6 +75,54 @@ mockMvc.get("/person/{name}", "Lee") {



+[[kotlin-script-templates]]
+== Kotlin Script Templates
+
+Spring Framework provides a
+{spring-framework-api}/web/servlet/view/script/ScriptTemplateView.html[`ScriptTemplateView`]
+which supports {JSR}223[JSR-223] to render templates by using script engines.
+
+By leveraging `scripting-jsr223` dependencies, it
+is possible to use such feature to render Kotlin-based templates with
+{kotlin-github-org}/kotlinx.html[kotlinx.html] DSL or Kotlin multiline interpolated `String`.
+
+`build.gradle.kts`
+[source,kotlin,indent=0]
+----
+dependencies {
+        runtime("org.jetbrains.kotlin:kotlin-scripting-jsr223:${kotlinVersion}")
+}
+----
+
+Configuration is usually done with `ScriptTemplateConfigurer` and `ScriptTemplateViewResolver` beans.
+
+`KotlinScriptConfiguration.kt`
+[source,kotlin,indent=0]
+----
+@Configuration
+class KotlinScriptConfiguration {
+
+    @Bean
+	fun kotlinScriptConfigurer() = ScriptTemplateConfigurer().apply {
+		engineName = "kotlin"
+		setScripts("scripts/render.kts")
+		renderFunction = "render"
+		isSharedEngine = false
+	}
+
+    @Bean
+    fun kotlinScriptViewResolver() = ScriptTemplateViewResolver().apply {
+        setPrefix("templates/")
+        setSuffix(".kts")
+    }
+}
+----
+
+See the https://github.com/sdeleuze/kotlin-script-templating[kotlin-script-templating] example
+project for more details.
+
+
+
 [[kotlin-multiplatform-serialization]]
 == Kotlin multiplatform serialization

@@ -171,9 +171,9 @@ the parameters of a test class constructor are autowired from components in the

 If `@TestConstructor` is not present or meta-present on a test class, the default _test
 constructor autowire mode_ will be used. See the tip below for details on how to change
-the default mode. Note, however, that a local declaration of `@Autowired` or
-`@jakarta.inject.Inject` on a constructor takes precedence over both `@TestConstructor`
-and the default mode.
+the default mode. Note, however, that a local declaration of `@Autowired`,
+`@jakarta.inject.Inject`, or `@javax.inject.Inject` on a constructor takes precedence
+over both `@TestConstructor` and the default mode.

 .Changing the default test constructor autowire mode
 [TIP]
@@ -1,31 +1,38 @@
 [[spring-testing-annotation-beanoverriding-mockitobean]]
 = `@MockitoBean` and `@MockitoSpyBean`

-`@MockitoBean` and `@MockitoSpyBean` are used on non-static fields in test classes to
-override beans in the test's `ApplicationContext` with a Mockito _mock_ or _spy_,
-respectively. In the latter case, an early instance of the original bean is captured and
-wrapped by the spy.
+`@MockitoBean` and `@MockitoSpyBean` are used on fields in test classes to override beans
+in the test's `ApplicationContext` with a Mockito _mock_ or _spy_, respectively. In the
+latter case, an early instance of the original bean is captured and wrapped by the spy.

 By default, the annotated field's type is used to search for candidate beans to override.
 If multiple candidates match, `@Qualifier` can be provided to narrow the candidate to
 override. Alternatively, a candidate whose bean name matches the name of the field will
 match.

+When using `@MockitoBean`, a new bean will be created if a corresponding bean does not
+exist. However, if you would like for the test to fail when a corresponding bean does not
+exist, you can set the `enforceOverride` attribute to `true` – for example,
+`@MockitoBean(enforceOverride = true)`.
+
+To use a by-name override rather than a by-type override, specify the `name` attribute
+of the annotation.
+
 [WARNING]
 ====
 Qualifiers, including the name of the field, are used to determine if a separate
 `ApplicationContext` needs to be created. If you are using this feature to mock or spy
-the same bean in several test classes, make sure to name the field consistently to avoid
+the same bean in several tests, make sure to name the field consistently to avoid
 creating unnecessary contexts.
 ====

-Each annotation also defines Mockito-specific attributes to fine-tune the mocking behavior.
+Each annotation also defines Mockito-specific attributes to fine-tune the mocking details.

-The `@MockitoBean` annotation uses the `REPLACE_OR_CREATE`
+By default, the `@MockitoBean` annotation uses the `REPLACE_OR_CREATE`
 xref:testing/testcontext-framework/bean-overriding.adoc#testcontext-bean-overriding-custom[strategy for test bean overriding].
-If no existing bean matches, a new bean is created on the fly. However, you can switch to
-the `REPLACE` strategy by setting the `enforceOverride` attribute to `true`. See the
-following section for an example.
+If no existing bean matches, a new bean is created on the fly. As mentioned previously,
+you can switch to the `REPLACE` strategy by setting the `enforceOverride` attribute to
+`true`.

 The `@MockitoSpyBean` annotation uses the `WRAP`
 xref:testing/testcontext-framework/bean-overriding.adoc#testcontext-bean-overriding-custom[strategy],
@@ -44,26 +51,6 @@ When using `@MockitoSpyBean` to create a spy for a `FactoryBean`, a spy will be
 for the object created by the `FactoryBean`, not for the `FactoryBean` itself.
 ====

-[NOTE]
-====
-There are no restrictions on the visibility of `@MockitoBean` and `@MockitoSpyBean`
-fields.
-
-Such fields can therefore be `public`, `protected`, package-private (default visibility),
-or `private` depending on the needs or coding practices of the project.
-====
-
-[[spring-testing-annotation-beanoverriding-mockitobean-examples]]
-== `@MockitoBean` Examples
-
-When using `@MockitoBean`, a new bean will be created if a corresponding bean does not
-exist. However, if you would like for the test to fail when a corresponding bean does not
-exist, you can set the `enforceOverride` attribute to `true` – for example,
-`@MockitoBean(enforceOverride = true)`.
-
-To use a by-name override rather than a by-type override, specify the `name` (or `value`)
-attribute of the annotation.
-
 The following example shows how to use the default behavior of the `@MockitoBean` annotation:

 [tabs]
@@ -72,13 +59,11 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@SpringJUnitConfig(TestConfig.class)
-	class BeanOverrideTests {
-
+	class OverrideBeanTests {
 		@MockitoBean // <1>
-		CustomService customService;
+		private CustomService customService;

-		// tests...
+		// test case body...
 	}
 ----
 <1> Replace the bean with type `CustomService` with a Mockito `mock`.
@@ -87,8 +72,8 @@ Java::
 In the example above, we are creating a mock for `CustomService`. If more than one bean
 of that type exists, the bean named `customService` is considered. Otherwise, the test
 will fail, and you will need to provide a qualifier of some sort to identify which of the
-`CustomService` beans you want to override. If no such bean exists, a bean will be
-created with an auto-generated bean name.
+`CustomService` beans you want to override. If no such bean exists, a bean definition
+will be created with an auto-generated bean name.

 The following example uses a by-name lookup, rather than a by-type lookup:

@@ -98,43 +83,20 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@SpringJUnitConfig(TestConfig.class)
-	class BeanOverrideTests {
-
+	class OverrideBeanTests {
 		@MockitoBean("service") // <1>
-		CustomService customService;
+		private CustomService customService;

-		// tests...
+		// test case body...

 	}
 ----
 <1> Replace the bean named `service` with a Mockito `mock`.
 ======

-If no bean named `service` exists, one is created.
+If no bean definition named `service` exists, one is created.

-`@MockitoBean` can also be used at the type level:
-
- on a test class or any superclass or implemented interface in the type hierarchy above
-  the test class
- on an enclosing class for a `@Nested` test class or on any class or interface in the
-  type hierarchy or enclosing class hierarchy above the `@Nested` test class
-
-When `@MockitoBean` is declared at the type level, the type of bean (or beans) to mock
-must be supplied via the `types` attribute – for example,
-`@MockitoBean(types = {OrderService.class, UserService.class})`. If multiple candidates
-exist in the application context, you can explicitly specify a bean name to mock by
-setting the `name` attribute. Note, however, that the `types` attribute must contain a
-single type if an explicit bean `name` is configured – for example,
-`@MockitoBean(name = "ps1", types = PrintingService.class)`.
-
-To support reuse of mock configuration, `@MockitoBean` may be used as a meta-annotation
-to create custom _composed annotations_ — for example, to define common mock
-configuration in a single annotation that can be reused across a test suite.
-`@MockitoBean` can also be used as a repeatable annotation at the type level — for
-example, to mock several beans by name.
-
-The following `@SharedMocks` annotation registers two mocks by-type and one mock by-name.
+The following example shows how to use the default behavior of the `@MockitoSpyBean` annotation:

 [tabs]
 ======
@@ -142,70 +104,11 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@Target(ElementType.TYPE)
-	@Retention(RetentionPolicy.RUNTIME)
-	@MockitoBean(types = {OrderService.class, UserService.class}) // <1>
-	@MockitoBean(name = "ps1", types = PrintingService.class) // <2>
-	public @interface SharedMocks {
-	}
----
-<1> Register `OrderService` and `UserService` mocks by-type.
-<2> Register `PrintingService` mock by-name.
-======
-
-The following demonstrates how `@SharedMocks` can be used on a test class.
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
----
-	@SpringJUnitConfig(TestConfig.class)
-	@SharedMocks // <1>
-	class BeanOverrideTests {
-
-		@Autowired OrderService orderService; // <2>
-
-		@Autowired UserService userService; // <2>
-
-		@Autowired PrintingService ps1; // <2>
-
-		// Inject other components that rely on the mocks.
-
-		@Test
-		void testThatDependsOnMocks() {
-			// ...
-		}
-	}
----
-<1> Register common mocks via the custom `@SharedMocks` annotation.
-<2> Optionally inject mocks to _stub_ or _verify_ them.
-======
-
-TIP: The mocks can also be injected into `@Configuration` classes or other test-related
-components in the `ApplicationContext` in order to configure them with Mockito's stubbing
-APIs.
-
-[[spring-testing-annotation-beanoverriding-mockitospybean-examples]]
-== `@MockitoSpyBean` Examples
-
-The following example shows how to use the default behavior of the `@MockitoSpyBean`
-annotation:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes"]
----
-	@SpringJUnitConfig(TestConfig.class)
-	class BeanOverrideTests {
-
+	class OverrideBeanTests {
 		@MockitoSpyBean // <1>
-		CustomService customService;
+		private CustomService customService;

-		// tests...
+		// test case body...
 	}
 ----
 <1> Wrap the bean with type `CustomService` with a Mockito `spy`.
@@ -224,13 +127,12 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	@SpringJUnitConfig(TestConfig.class)
-	class BeanOverrideTests {
-
+	class OverrideBeanTests {
 		@MockitoSpyBean("service") // <1>
-		CustomService customService;
+		private CustomService customService;
+
+		// test case body...

-		// tests...
 	}
 ----
 <1> Wrap the bean named `service` with a Mockito `spy`.
@@ -1,8 +1,8 @@
 [[spring-testing-annotation-beanoverriding-testbean]]
 = `@TestBean`

-`@TestBean` is used on a non-static field in a test class to override a specific bean in
-the test's `ApplicationContext` with an instance provided by a factory method.
+`@TestBean` is used on a field in a test class to override a specific bean in the test's
+`ApplicationContext` with an instance provided by a factory method.

 The associated factory method name is derived from the annotated field's name, or the
 bean name if specified. The factory method must be `static`, accept no arguments, and
@@ -30,14 +30,6 @@ same bean in several tests, make sure to name the field consistently to avoid cr
 unnecessary contexts.
 ====

-[NOTE]
-====
-There are no restrictions on the visibility of `@TestBean` fields or factory methods.
-
-Such fields and methods can therefore be `public`, `protected`, package-private (default
-visibility), or `private` depending on the needs or coding practices of the project.
-====
-
 The following example shows how to use the default behavior of the `@TestBean` annotation:

 [tabs]
@@ -48,11 +40,11 @@ Java::
 ----
 	class OverrideBeanTests {
 		@TestBean // <1>
-		CustomService customService;
+		private CustomService customService;

 		// test case body...

-		static CustomService customService() { // <2>
+		private static CustomService customService() { // <2>
 			return new MyFakeCustomService();
 		}
 	}
@@ -76,11 +68,11 @@ Java::
 ----
 	class OverrideBeanTests {
 		@TestBean(name = "service", methodName = "createCustomService") // <1>
-		CustomService customService;
+		private CustomService customService;

 		// test case body...

-		static CustomService createCustomService() { // <2>
+		private static CustomService createCustomService() { // <2>
 			return new MyFakeCustomService();
 		}
 	}
@@ -92,10 +84,8 @@ Java::

 [TIP]
 ====
-To locate the factory method to invoke, Spring searches in the class in which the
-`@TestBean` field is declared, in one of its superclasses, or in any implemented
-interfaces. If the `@TestBean` field is declared in a `@Nested` test class, the enclosing
-class hierarchy will also be searched.
+Spring searches for the factory method to invoke in the test class, in the test class
+hierarchy, and in the enclosing class hierarchy for a `@Nested` test class.

 Alternatively, a factory method in an external class can be referenced via its
 fully-qualified method name following the syntax `<fully-qualified class name>#<method name>`
@@ -2,8 +2,7 @@
 = Bean Overriding in Tests

 Bean overriding in tests refers to the ability to override specific beans in the
-`ApplicationContext` for a test class, by annotating one or more non-static fields in the
-test class.
+`ApplicationContext` for a test class, by annotating one or more fields in the test class.

 NOTE: This feature is intended as a less risky alternative to the practice of registering
 a bean via `@Bean` with the `DefaultListableBeanFactory`
@@ -42,10 +41,9 @@ The `spring-test` module registers implementations of the latter two
 {spring-framework-code}/spring-test/src/main/resources/META-INF/spring.factories[`META-INF/spring.factories`
 properties file].

-The bean overriding infrastructure searches in test classes for any non-static field that
-is meta-annotated with `@BeanOverride` and instantiates the corresponding
-`BeanOverrideProcessor` which is responsible for creating an appropriate
-`BeanOverrideHandler`.
+The bean overriding infrastructure searches in test classes for any field meta-annotated
+with `@BeanOverride` and instantiates the corresponding `BeanOverrideProcessor` which is
+responsible for creating an appropriate `BeanOverrideHandler`.

 The internal `BeanOverrideBeanFactoryPostProcessor` then uses bean override handlers to
 alter the test's `ApplicationContext` by creating, replacing, or wrapping beans as
@@ -96,7 +96,9 @@ Kotlin::
 The following code snippet is similar to the one we saw earlier for a request-scoped
 bean. However, this time, the `userService` bean has a dependency on a session-scoped
 `userPreferences` bean. Note that the `UserPreferences` bean is instantiated by using a
-SpEL expression that retrieves an attribute from the current HTTP session.
+SpEL expression that retrieves the theme from the current HTTP session. In our test, we
+need to configure a theme in the mock session managed by the TestContext framework. The
+following example shows how to do so:

 .Session-scoped bean configuration
 [source,xml,indent=0,subs="verbatim,quotes"]
@@ -127,7 +127,7 @@ Kotlin::
 ======

 For Spring MVC, use the following where the Spring `ApplicationContext` is passed to
-{spring-framework-api}/test/web/servlet/setup/MockMvcBuilders.html#webAppContextSetup(org.springframework.web.context.WebApplicationContext)[MockMvcBuilders.webAppContextSetup]
+{spring-framework-api}/test/web/servlet/setup/MockMvcBuilders.html#webAppContextSetup-org.springframework.web.context.WebApplicationContext-[MockMvcBuilders.webAppContextSetup]
 to create a xref:testing/mockmvc.adoc[MockMvc] instance to handle
 requests:

@@ -193,7 +193,7 @@ Kotlin::
 [[webtestclient-fn-config]]
 === Bind to Router Function

-This setup allows you to test xref:web/webflux-functional.adoc[functional endpoints] via
+This setup allows you to test <<web-reactive.adoc#webflux-fn, functional endpoints>> via
 mock request and response objects, without a running server.

 For WebFlux, use the following which delegates to `RouterFunctions.toWebHandler` to
@@ -1,6 +1,5 @@
 [[webflux-cors]]
 = CORS
-
 [.small]#xref:web/webmvc-cors.adoc[See equivalent in the Servlet stack]#

 Spring WebFlux lets you handle CORS (Cross-Origin Resource Sharing). This section
@@ -365,7 +364,7 @@ Kotlin::

 You can apply CORS support through the built-in
 {spring-framework-api}/web/cors/reactive/CorsWebFilter.html[`CorsWebFilter`], which is a
-good fit with xref:web/webflux-functional.adoc[functional endpoints].
+good fit with <<webflux-fn, functional endpoints>>.

 NOTE: If you try to use the `CorsFilter` with Spring Security, keep in mind that Spring
 Security has {docs-spring-security}/servlet/integrations/cors.html[built-in support] for
@@ -1,6 +1,5 @@
 [[webflux-fn]]
 = Functional Endpoints
-
 [.small]#xref:web/webmvc-functional.adoc[See equivalent in the Servlet stack]#

 Spring WebFlux includes WebFlux.fn, a lightweight functional programming model in which functions
@@ -804,7 +803,8 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	ClassPathResource index = new ClassPathResource("static/index.html");
-	RequestPredicate spaPredicate = path("/api/**").or(path("/error")).negate();
+	List<String> extensions = List.of("js", "css", "ico", "png", "jpg", "gif");
+	RequestPredicate spaPredicate = path("/api/**").or(path("/error")).or(pathExtension(extensions::contains)).negate();
 	RouterFunction<ServerResponse> redirectToIndex = route()
 		.resource(spaPredicate, index)
 		.build();
@@ -816,7 +816,9 @@ Kotlin::
 ----
 	val redirectToIndex = router {
 		val index = ClassPathResource("static/index.html")
-		val spaPredicate = !(path("/api/**") or path("/error"))
+		val extensions = listOf("js", "css", "ico", "png", "jpg", "gif")
+		val spaPredicate = !(path("/api/**") or path("/error") or
+			pathExtension(extensions::contains))
 		resource(spaPredicate, index)
 	}
 ----
@@ -466,7 +466,7 @@ Java::
 ----
 	@GetMapping
 	FragmentsRendering handle() {
-		return FragmentsRendering.fragment("posts").fragment("comments").build();
+		return FragmentsRendering.with("posts").fragment("comments").build();
 	}
 ----

@@ -476,7 +476,7 @@ Kotlin::
 ----
 	@GetMapping
 	fun handle(): FragmentsRendering {
-		return FragmentsRendering.fragment("posts").fragment("comments").build()
+		return FragmentsRendering.with("posts").fragment("comments").build()
 	}
 ----
 ======
@@ -1,6 +1,5 @@
 [[webflux-websocket]]
 = WebSockets
-
 [.small]#xref:web/websocket.adoc[See equivalent in the Servlet stack]#

 This part of the reference documentation covers support for reactive-stack WebSocket
@@ -647,12 +647,13 @@ For https://www.webjars.org/documentation[WebJars], versioned URLs like
 `/webjars/jquery/1.2.0/jquery.min.js` are the recommended and most efficient way to use them.
 The related resource location is configured out of the box with Spring Boot (or can be configured
 manually via `ResourceHandlerRegistry`) and does not require to add the
-`org.webjars:webjars-locator-lite` dependency.
+`org.webjars:webjars-locator-core` dependency.

 Version-less URLs like `/webjars/jquery/jquery.min.js` are supported through the
 `WebJarsResourceResolver` which is automatically registered when the
-`org.webjars:webjars-locator-lite` library is present on the classpath. The resolver can re-write
-URLs to include the version of the jar and can also match against incoming URLs without versions
+`org.webjars:webjars-locator-core` library is present on the classpath, at the cost of a
+classpath scanning that could slow down application startup. The resolver can re-write URLs to
+include the version of the jar and can also match against incoming URLs without versions
 -- for example, from `/webjars/jquery/jquery.min.js` to `/webjars/jquery/1.2.0/jquery.min.js`.

 TIP: The Java configuration based on `ResourceHandlerRegistry` provides further options
@@ -605,4 +605,9 @@ For method parameters and returns values, generally, `@HttpExchange` supports a
 subset of the method parameters that `@RequestMapping` does. Notably, it excludes any
 server-side specific parameter types. For details, see the list for
 xref:integration/rest-clients.adoc#rest-http-interface-method-parameters[@HttpExchange] and
-xref:web/webflux/controller/ann-methods/arguments.adoc[@RequestMapping].
+xref:web/webflux/controller/ann-methods/arguments.adoc[@RequestMapping].
+
+`@HttpExchange` also supports a `headers()` parameter which accepts `"name=value"`-like
+pairs like in `@RequestMapping(headers={})` on the client side. On the server side,
+this extends to the full syntax that
+xref:#webflux-ann-requestmapping-params-and-headers[`@RequestMapping`] supports.
@@ -101,7 +101,7 @@ On that foundation, Spring WebFlux provides a choice of two programming models:
 from the `spring-web` module. Both Spring MVC and WebFlux controllers support reactive
 (Reactor and RxJava) return types, and, as a result, it is not easy to tell them apart. One notable
 difference is that WebFlux also supports reactive `@RequestBody` arguments.
-* xref:web/webflux-functional.adoc[Functional Endpoints]: Lambda-based, lightweight, and functional programming model. You can think of
+* <<webflux-fn>>: Lambda-based, lightweight, and functional programming model. You can think of
 this as a small library or a set of utilities that an application can use to route and
 handle requests. The big difference with annotated controllers is that the application
 is in charge of request handling from start to finish versus declaring intent through
@@ -1,6 +1,5 @@
 [[mvc-cors]]
 = CORS
-
 [.small]#xref:web/webflux-cors.adoc[See equivalent in the Reactive stack]#

 Spring MVC lets you handle CORS (Cross-Origin Resource Sharing). This section
@@ -1,7 +1,6 @@
 [[webmvc-fn]]
 = Functional Endpoints
-
-[.small]#xref:web/webflux-functional.adoc[See equivalent in the Reactive stack]#
+[.small]#<<web-reactive.adoc#webflux-fn, See equivalent in the Reactive stack>>#

 Spring Web MVC includes WebMvc.fn, a lightweight functional programming model in which functions
 are used to route and handle requests and contracts are designed for immutability.
@@ -783,7 +782,7 @@ Java::
 ----
    ClassPathResource index = new ClassPathResource("static/index.html");
 	List<String> extensions = List.of("js", "css", "ico", "png", "jpg", "gif");
-	RequestPredicate spaPredicate = path("/api/**").or(path("/error")).negate();
+	RequestPredicate spaPredicate = path("/api/**").or(path("/error")).or(pathExtension(extensions::contains)).negate();
 	RouterFunction<ServerResponse> redirectToIndex = route()
 		.resource(spaPredicate, index)
 		.build();
@@ -795,7 +794,9 @@ Kotlin::
 ----
    val redirectToIndex = router {
 		val index = ClassPathResource("static/index.html")
-		val spaPredicate = !(path("/api/**") or path("/error"))
+		val extensions = listOf("js", "css", "ico", "png", "jpg", "gif")
+		val spaPredicate = !(path("/api/**") or path("/error") or
+			pathExtension(extensions::contains))
 		resource(spaPredicate, index)
 	}
 ----
@@ -48,7 +48,7 @@ Java::
 ----
 	@GetMapping
 	FragmentsRendering handle() {
-		return FragmentsRendering.fragment("posts").fragment("comments").build();
+		return FragmentsRendering.with("posts").fragment("comments").build();
 	}
 ----

@@ -58,7 +58,7 @@ Kotlin::
 ----
 	@GetMapping
 	fun handle(): FragmentsRendering {
-		return FragmentsRendering.fragment("posts").fragment("comments").build()
+		return FragmentsRendering.with("posts").fragment("comments").build()
 	}
 ----
 ======
@@ -30,7 +30,7 @@ available through the `ServletRequest.getParameter{asterisk}()` family of method



-[[filters-forwarded-headers]]
+[[forwarded-headers]]
 == Forwarded Headers
 [.small]#xref:web/webflux/reactive-spring.adoc#webflux-forwarded-headers[See equivalent in the Reactive stack]#

@@ -118,12 +118,12 @@ See the sections on xref:web/webmvc-cors.adoc[CORS] and the xref:web/webmvc-cors
 [.small]#xref:web/webflux/reactive-spring.adoc#filters.url-handler[See equivalent in the Reactive stack]#

 In previous Spring Framework versions, Spring MVC could be configured to ignore trailing slashes in URL paths
-when mapping incoming requests on controller methods. This means that sending a "GET /home/" request would be
-handled by a controller method annotated with `@GetMapping("/home")`.
+when mapping incoming requests on controller methods. This could be done by enabling the `setUseTrailingSlashMatch`
+option on the `PathMatchConfigurer`. This means that sending a "GET /home/" request would be handled by a controller
+method annotated with `@GetMapping("/home")`.

-This option was deprecated in 6.0 and removed in 7.0, but applications are still expected to handle such
-requests in a safe way. The `UrlHandlerFilter` Servlet filter has been designed for this purpose.
-It can be configured to:
+This option has been retired, but applications are still expected to handle such requests in a safe way.
+The `UrlHandlerFilter` Servlet filter has been designed for this purpose. It can be configured to:

 * respond with an HTTP redirect status when receiving URLs with trailing slashes, sending browsers to the non-trailing slash URL variant.
 * wrap the request to act as if the request was sent without a trailing slash and continue the processing of the request.
@@ -7,10 +7,6 @@ You can use the `@EnableWebMvc` annotation to enable MVC configuration with prog

 include-code::./WebConfiguration[tag=snippet,indent=0]

-WARNING: As of 7.0, support for the XML configuration namespace for Spring MVC has been deprecated.
-There are no plans yet for removing it completely but XML configuration will not be updated to follow
-the Java configuration model.
-
 NOTE: When using Spring Boot, you may want to use `@Configuration` classes of type `WebMvcConfigurer` but without `@EnableWebMvc` to keep Spring Boot MVC customizations. See more details in xref:web/webmvc/mvc-config/customize.adoc[the MVC Config API section] and in {spring-boot-docs-ref}/web/servlet.html#web.servlet.spring-mvc.auto-configuration[the dedicated Spring Boot documentation].

 The preceding example registers a number of Spring MVC
@@ -48,12 +48,13 @@ For https://www.webjars.org/documentation[WebJars], versioned URLs like
 `/webjars/jquery/1.2.0/jquery.min.js` are the recommended and most efficient way to use them.
 The related resource location is configured out of the box with Spring Boot (or can be configured
 manually via `ResourceHandlerRegistry`) and does not require to add the
-`org.webjars:webjars-locator-lite` dependency.
+`org.webjars:webjars-locator-core` dependency.

 Version-less URLs like `/webjars/jquery/jquery.min.js` are supported through the
 `WebJarsResourceResolver` which is automatically registered when the
-`org.webjars:webjars-locator-lite` library is present on the classpath. The resolver can re-write
-URLs to include the version of the jar and can also match against incoming URLs without versions
+`org.webjars:webjars-locator-core` library is present on the classpath, at the cost of a
+classpath scanning that could slow down application startup. The resolver can re-write URLs to
+include the version of the jar and can also match against incoming URLs without versions
 -- for example, from `/webjars/jquery/jquery.min.js` to `/webjars/jquery/1.2.0/jquery.min.js`.

 TIP: The Java configuration based on `ResourceHandlerRegistry` provides further options
@@ -30,7 +30,8 @@ and others) and is equivalent to `required=false`.

 | `jakarta.servlet.http.PushBuilder`
 | Servlet 4.0 push builder API for programmatic HTTP/2 resource pushes.
-  Note that this API has been deprecated as of Servlet 6.1.
+  Note that, per the Servlet specification, the injected `PushBuilder` instance can be null if the client
+  does not support that HTTP/2 feature.

 | `java.security.Principal`
 | Currently authenticated user -- possibly a specific `Principal` implementation class if known.
@@ -157,7 +157,9 @@ Kotlin::
 ----
 ======

-Note that you need to enable the use of matrix variables. In the MVC XML namespace, you can set
+Note that you need to enable the use of matrix variables. In the MVC Java configuration,
+you need to set a `UrlPathHelper` with `removeSemicolonContent=false` through
+xref:web/webmvc/mvc-config/path-matching.adoc[Path Matching]. In the MVC XML namespace, you can set
 `<mvc:annotation-driven enable-matrix-variables="true"/>`.


@@ -248,6 +248,36 @@ specific than other pattern that do not have double wildcards.
 For the full details, follow the above links to the pattern Comparators.


+[[mvc-ann-requestmapping-suffix-pattern-match]]
+== Suffix Match
+
+Starting in 5.3, by default Spring MVC no longer performs `.{asterisk}` suffix pattern
+matching where a controller mapped to `/person` is also implicitly mapped to
+`/person.{asterisk}`. As a consequence path extensions are no longer used to interpret
+the requested content type for the response -- for example, `/person.pdf`, `/person.xml`,
+and so on.
+
+Using file extensions in this way was necessary when browsers used to send `Accept` headers
+that were hard to interpret consistently. At present, that is no longer a necessity and
+using the `Accept` header should be the preferred choice.
+
+Over time, the use of file name extensions has proven problematic in a variety of ways.
+It can cause ambiguity when overlain with the use of URI variables, path parameters, and
+URI encoding. Reasoning about URL-based authorization
+and security (see next section for more details) also becomes more difficult.
+
+To completely disable the use of path extensions in versions prior to 5.3, set the following:
+
+* `useSuffixPatternMatching(false)`, see xref:web/webmvc/mvc-config/path-matching.adoc[PathMatchConfigurer]
+* `favorPathExtension(false)`, see xref:web/webmvc/mvc-config/content-negotiation.adoc[ContentNegotiationConfigurer]
+
+Having a way to request content types other than through the `"Accept"` header can still
+be useful, for example, when typing a URL in a browser. A safe alternative to path extensions is
+to use the query parameter strategy. If you must use file extensions, consider restricting
+them to a list of explicitly registered extensions through the `mediaTypes` property of
+xref:web/webmvc/mvc-config/content-negotiation.adoc[ContentNegotiationConfigurer].
+
+
 [[mvc-ann-requestmapping-rfd]]
 == Suffix Match and RFD

@@ -4,8 +4,12 @@

 [.small]#xref:web/webflux/http2.adoc[See equivalent in the Reactive stack]#

-Servlet 4 containers are required to support HTTP/2, and Spring Framework requires
-Servlet API 6.1. From a programming model perspective, there is nothing specific that
+Servlet 4 containers are required to support HTTP/2, and Spring Framework 5 is compatible
+with Servlet API 4. From a programming model perspective, there is nothing specific that
 applications need to do. However, there are considerations related to server configuration.
 For more details, see the
 {spring-framework-wiki}/HTTP-2-support[HTTP/2 wiki page].
+
+The Servlet API does expose one construct related to HTTP/2. You can use the
+`jakarta.servlet.http.PushBuilder` to proactively push resources to clients, and it
+is supported as a xref:web/webmvc/mvc-controller/ann-methods/arguments.adoc[method argument] to `@RequestMapping` methods.
@@ -11,6 +11,8 @@ The `DispatcherServlet` processes requests as follows:
 * The locale resolver is bound to the request to let elements in the process
  resolve the locale to use when processing the request (rendering the view, preparing
  data, and so on). If you do not need locale resolving, you do not need the locale resolver.
+* The theme resolver is bound to the request to let elements such as views determine
+  which theme to use. If you do not use themes, you can ignore it.
 * If you specify a multipart file resolver, the request is inspected for multiparts. If
  multiparts are found, the request is wrapped in a `MultipartHttpServletRequest` for
  further processing by other elements in the process. See xref:web/webmvc/mvc-servlet/multipart.adoc[Multipart Resolver] for further
@@ -43,6 +43,10 @@ The following table lists the special beans detected by the `DispatcherServlet`:
 | Resolve the `Locale` a client is using and possibly their time zone, in order to be able
  to offer internationalized views. See xref:web/webmvc/mvc-servlet/localeresolver.adoc[Locale].

+| xref:web/webmvc/mvc-servlet/themeresolver.adoc[`ThemeResolver`]
+| Resolve themes your web application can use -- for example, to offer personalized layouts.
+  See xref:web/webmvc/mvc-servlet/themeresolver.adoc[Themes].
+
 | xref:web/webmvc/mvc-servlet/multipart.adoc[`MultipartResolver`]
 | Abstraction for parsing a multi-part request (for example, browser form file upload) with
  the help of some multipart parsing library. See xref:web/webmvc/mvc-servlet/multipart.adoc[Multipart Resolver].
@@ -0,0 +1,92 @@
+[[mvc-themeresolver]]
+= Themes
+
+You can apply Spring Web MVC framework themes to set the overall look-and-feel of your
+application, thereby enhancing user experience. A theme is a collection of static
+resources, typically style sheets and images, that affect the visual style of the
+application.
+
+WARNING: as of 6.0 support for themes has been deprecated theme in favor of using CSS,
+and without any special support on the server side.
+
+
+[[mvc-themeresolver-defining]]
+== Defining a theme
+
+To use themes in your web application, you must set up an implementation of the
+`org.springframework.ui.context.ThemeSource` interface. The `WebApplicationContext`
+interface extends `ThemeSource` but delegates its responsibilities to a dedicated
+implementation. By default, the delegate is an
+`org.springframework.ui.context.support.ResourceBundleThemeSource` implementation that
+loads properties files from the root of the classpath. To use a custom `ThemeSource`
+implementation or to configure the base name prefix of the `ResourceBundleThemeSource`,
+you can register a bean in the application context with the reserved name, `themeSource`.
+The web application context automatically detects a bean with that name and uses it.
+
+When you use the `ResourceBundleThemeSource`, a theme is defined in a simple properties
+file. The properties file lists the resources that make up the theme, as the following example shows:
+
+[literal,subs="verbatim,quotes"]
+----
+styleSheet=/themes/cool/style.css
+background=/themes/cool/img/coolBg.jpg
+----
+
+The keys of the properties are the names that refer to the themed elements from view
+code. For a JSP, you typically do this using the `spring:theme` custom tag, which is
+very similar to the `spring:message` tag. The following JSP fragment uses the theme
+defined in the previous example to customize the look and feel:
+
+[source,xml,indent=0,subs="verbatim,quotes"]
+----
+	<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+	<html>
+		<head>
+			<link rel="stylesheet" href="<spring:theme code='styleSheet'/>" type="text/css"/>
+		</head>
+		<body style="background=<spring:theme code='background'/>">
+			...
+		</body>
+	</html>
+----
+
+By default, the `ResourceBundleThemeSource` uses an empty base name prefix. As a result,
+the properties files are loaded from the root of the classpath. Thus, you would put the
+`cool.properties` theme definition in a directory at the root of the classpath (for
+example, in `/WEB-INF/classes`). The `ResourceBundleThemeSource` uses the standard Java
+resource bundle loading mechanism, allowing for full internationalization of themes. For
+example, we could have a `/WEB-INF/classes/cool_nl.properties` that references a special
+background image with Dutch text on it.
+
+
+[[mvc-themeresolver-resolving]]
+== Resolving Themes
+
+After you define themes, as described in the xref:web/webmvc/mvc-servlet/themeresolver.adoc#mvc-themeresolver-defining[preceding section],
+you decide which theme to use. The `DispatcherServlet` looks for a bean named `themeResolver`
+to find out which `ThemeResolver` implementation to use. A theme resolver works in much the same
+way as a `LocaleResolver`. It detects the theme to use for a particular request and can also
+alter the request's theme. The following table describes the theme resolvers provided by Spring:
+
+[[mvc-theme-resolver-impls-tbl]]
+.ThemeResolver implementations
+[cols="1,4"]
+|===
+| Class | Description
+
+| `FixedThemeResolver`
+| Selects a fixed theme, set by using the `defaultThemeName` property.
+
+| `SessionThemeResolver`
+| The theme is maintained in the user's HTTP session. It needs to be set only once for
+  each session but is not persisted between sessions.
+
+| `CookieThemeResolver`
+| The selected theme is stored in a cookie on the client.
+|===
+
+Spring also provides a `ThemeChangeInterceptor` that lets theme changes on every
+request with a simple request parameter.
+
+
+
@@ -1,7 +1,6 @@
 [[websocket]]
 = WebSockets
 :page-section-summary-toc: 1
-
 [.small]#xref:web/webflux-websocket.adoc[See equivalent in the Reactive stack]#

 This part of the reference documentation covers support for Servlet stack, WebSocket
@@ -85,7 +85,10 @@ for all HTTP processing -- including WebSocket handshake and all other HTTP
 requests -- such as Spring MVC's `DispatcherServlet`.

 This is a significant limitation of JSR-356 that Spring's WebSocket support addresses with
-a standard `RequestUpgradeStrategy` implementation when running in a WebSocket API 2.1+ runtime.
+server-specific `RequestUpgradeStrategy` implementations even when running in a JSR-356 runtime.
+Such strategies currently exist for Tomcat, Jetty, GlassFish, WebLogic, WebSphere, and Undertow
+(and WildFly). As of Jakarta WebSocket 2.1, a standard request upgrade strategy is available
+which Spring chooses on Jakarta EE 10 based web containers such as Tomcat 10.1 and Jetty 12.

 A secondary consideration is that Servlet containers with JSR-356 support are expected
 to perform a `ServletContainerInitializer` (SCI) scan that can slow down application
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -24,6 +24,7 @@ import org.springframework.aot.hint.ExecutableMode;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.test.agent.EnabledIfRuntimeHintsAgent;
 import org.springframework.aot.test.agent.RuntimeHintsInvocations;
+import org.springframework.aot.test.agent.RuntimeHintsRecorder;
 import org.springframework.core.SpringVersion;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -32,7 +33,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 // method is only enabled if the RuntimeHintsAgent is loaded on the current JVM.
 // It also tags tests with the "RuntimeHints" JUnit tag.
@EnabledIfRuntimeHintsAgent
-@SuppressWarnings("removal")
 class SampleReflectionRuntimeHintsTests {

 	@Test
@@ -43,7 +43,7 @@ class SampleReflectionRuntimeHintsTests {
 				typeHint.withMethod("getVersion", List.of(), ExecutableMode.INVOKE));

 		// Invoke the relevant piece of code we want to test within a recording lambda
-		RuntimeHintsInvocations invocations = org.springframework.aot.test.agent.RuntimeHintsRecorder.record(() -> {
+		RuntimeHintsInvocations invocations = RuntimeHintsRecorder.record(() -> {
 			SampleReflection sample = new SampleReflection();
 			sample.performReflection();
 		});
@@ -1,105 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.integration.resthttpinterface.customresolver;
-
-import java.util.List;
-
-import org.springframework.core.MethodParameter;
-import org.springframework.web.client.RestClient;
-import org.springframework.web.client.support.RestClientAdapter;
-import org.springframework.web.service.annotation.GetExchange;
-import org.springframework.web.service.invoker.HttpRequestValues;
-import org.springframework.web.service.invoker.HttpServiceArgumentResolver;
-import org.springframework.web.service.invoker.HttpServiceProxyFactory;
-
-public class CustomHttpServiceArgumentResolver {
-
-	// tag::httpinterface[]
-	interface RepositoryService {
-
-		@GetExchange("/repos/search")
-		List<Repository> searchRepository(Search search);
-
-	}
-	// end::httpinterface[]
-
-	class Sample {
-
-		void sample() {
-			// tag::usage[]
-			RestClient restClient = RestClient.builder().baseUrl("https://api.github.com/").build();
-			RestClientAdapter adapter = RestClientAdapter.create(restClient);
-			HttpServiceProxyFactory factory = HttpServiceProxyFactory
-					.builderFor(adapter)
-					.customArgumentResolver(new SearchQueryArgumentResolver())
-					.build();
-			RepositoryService repositoryService = factory.createClient(RepositoryService.class);
-
-			Search search = Search.create()
-					.owner("spring-projects")
-					.language("java")
-					.query("rest")
-					.build();
-			List<Repository> repositories = repositoryService.searchRepository(search);
-			// end::usage[]
-		}
-
-	}
-
-	// tag::argumentresolver[]
-	static class SearchQueryArgumentResolver implements HttpServiceArgumentResolver {
-		@Override
-		public boolean resolve(Object argument, MethodParameter parameter, HttpRequestValues.Builder requestValues) {
-			if (parameter.getParameterType().equals(Search.class)) {
-				Search search = (Search) argument;
-				requestValues.addRequestParameter("owner", search.owner());
-				requestValues.addRequestParameter("language", search.language());
-				requestValues.addRequestParameter("query", search.query());
-				return true;
-			}
-			return false;
-		}
-	}
-	// end::argumentresolver[]
-
-
-	record Search (String query, String owner, String language) {
-
-		static Builder create() {
-			return new Builder();
-		}
-
-		static class Builder {
-
-			Builder query(String query) { return this;}
-
-			Builder owner(String owner) { return this;}
-
-			Builder language(String language) { return this;}
-
-			Search build() {
-				return new Search(null, null, null);
-			}
-		}
-
-	}
-
-	record Repository(String name) {
-
-	}
-
-}
@@ -1,20 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.core.beans.dependencies.beansfactorylazyinit
-
-class AnotherBean {
-}
@@ -1,20 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.core.beans.dependencies.beansfactorylazyinit
-
-class ExpensiveToCreateBean {
-}
@@ -1,20 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.core.expressions.expressionsbeandef
-
-class CustomerPreferenceDao {
-}
@@ -1,21 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.springframework.docs.core.expressions.expressionsbeandef
-
-class MovieFinder {
-}
@@ -31,11 +31,11 @@ class TestItemStoredProcedure(dataSource: DataSource) : StoredProcedure(dataSour
 				cs: CallableStatement, colIndx: Int, _: Int, _: String? ->
 				val struct = cs.getObject(colIndx) as Struct
 				val attr = struct.attributes
-				TestItem(
-					(attr[0] as Number).toLong(),
-					attr[1] as String,
-					attr[2] as Date
-				)
+				val item = TestItem()
+				item.id = (attr[0] as Number).toLong()
+				item.description = attr[1] as String
+				item.expirationDate = attr[2] as Date
+				item
 			})
 		// ...
 	}
@@ -1,20 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.dataaccess.jdbc.jdbcjdbctemplateidioms
-
-interface CorporateEventDao {
-}
@@ -28,7 +28,9 @@ class CustomCacheConfiguration {
 	// tag::snippet[]
 	@Bean
 	fun cacheManager(): CacheManager {
-		return CaffeineCacheManager("default", "books")
+		return CaffeineCacheManager().apply {
+			cacheNames = listOf("default", "books")
+		}
 	}
 	// end::snippet[]
 }
@@ -1,25 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.integration.jmx.jmxexporting
-
-interface IJmxTestBean {
-
-	var name: String
-	var age: Int
-	fun add(x: Int, y: Int): Int
-	fun dontExposeMe()
-}
@@ -19,8 +19,24 @@ package org.springframework.docs.integration.jmx.jmxexporting
 // tag::snippet[]
 class JmxTestBean : IJmxTestBean {

-	override lateinit var name: String
-	override var age = 0
+	private lateinit var name: String
+	private var age = 0
+
+	override fun getAge(): Int {
+		return age
+	}
+
+	override fun setAge(age: Int) {
+		this.age = age
+	}
+
+	override fun setName(name: String) {
+		this.name = name
+	}
+
+	override fun getName(): String {
+		return name
+	}

 	override fun add(x: Int, y: Int): Int {
 		return x + y
@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.integration.mailusagesimple
-
-data class Customer(
-	val emailAddress: String,
-	val firstName: String,
-	val lastName: String
-)
@@ -1,22 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.integration.mailusagesimple
-
-data class Order(
-	val customer: Customer,
-	val orderNumber: String
-)
@@ -1,78 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.integration.resthttpinterface.customresolver
-
-import org.springframework.core.MethodParameter
-import org.springframework.web.client.RestClient
-import org.springframework.web.client.support.RestClientAdapter
-import org.springframework.web.service.annotation.GetExchange
-import org.springframework.web.service.invoker.HttpRequestValues
-import org.springframework.web.service.invoker.HttpServiceArgumentResolver
-import org.springframework.web.service.invoker.HttpServiceProxyFactory
-
-class CustomHttpServiceArgumentResolver {
-
-	// tag::httpinterface[]
-	interface RepositoryService {
-
-		@GetExchange("/repos/search")
-		fun searchRepository(search: Search): List<Repository>
-
-	}
-	// end::httpinterface[]
-
-	class Sample {
-		fun sample() {
-			// tag::usage[]
-			val restClient = RestClient.builder().baseUrl("https://api.github.com/").build()
-			val adapter = RestClientAdapter.create(restClient)
-			val factory = HttpServiceProxyFactory
-				.builderFor(adapter)
-				.customArgumentResolver(SearchQueryArgumentResolver())
-				.build()
-			val repositoryService = factory.createClient<RepositoryService>(RepositoryService::class.java)
-
-			val search = Search(owner = "spring-projects", language = "java", query = "rest")
-			val repositories = repositoryService.searchRepository(search)
-			// end::usage[]
-			repositories.size
-		}
-	}
-
-	// tag::argumentresolver[]
-	class SearchQueryArgumentResolver : HttpServiceArgumentResolver {
-		override fun resolve(
-			argument: Any?,
-			parameter: MethodParameter,
-			requestValues: HttpRequestValues.Builder
-		): Boolean {
-			if (parameter.getParameterType() == Search::class.java) {
-				val search = argument as Search
-				requestValues.addRequestParameter("owner", search.owner)
-					.addRequestParameter("language", search.language)
-					.addRequestParameter("query", search.query)
-				return true
-			}
-			return false
-		}
-	}
-	// end::argumentresolver[]
-
-	data class Search(val query: String, val owner: String, val language: String)
-
-	data class Repository(val name: String)
-}
@@ -1,25 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.testing.mockmvc.assertj.mockmvctestersetup
-
-import org.springframework.context.annotation.Configuration
-import org.springframework.web.servlet.config.annotation.EnableWebMvc
-
-@Configuration(proxyBeanMethods = false)
-@EnableWebMvc
-class ApplicationWebConfiguration {
-}
@@ -14,13 +14,14 @@
 * limitations under the License.
 */

+@file:Suppress("DEPRECATION")
 package org.springframework.docs.web.webmvc.mvcconfig.mvcconfiginterceptors

 import org.springframework.context.annotation.Configuration
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
-import org.springframework.web.servlet.handler.UserRoleAuthorizationInterceptor
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor
+import org.springframework.web.servlet.theme.ThemeChangeInterceptor

 // tag::snippet[]
@Configuration
@@ -28,7 +29,7 @@ class WebConfiguration : WebMvcConfigurer {

 	override fun addInterceptors(registry: InterceptorRegistry) {
 		registry.addInterceptor(LocaleChangeInterceptor())
-		registry.addInterceptor(UserRoleAuthorizationInterceptor()).addPathPatterns("/**").excludePathPatterns("/admin/**")
+		registry.addInterceptor(ThemeChangeInterceptor()).addPathPatterns("/**").excludePathPatterns("/admin/**")
 	}
 }
 // end::snippet[]
@@ -1,22 +0,0 @@
-/*
- * Copyright 2002-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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.docs.web.websocket.websocketserverruntimeconfiguration
-
-import org.springframework.web.socket.handler.AbstractWebSocketHandler
-
-class MyEchoHandler : AbstractWebSocketHandler() {
-}
@@ -14,9 +14,7 @@
 		<mvc:interceptor>
 			<mvc:mapping path="/**"/>
 			<mvc:exclude-mapping path="/admin/**"/>
-			<bean class="org.springframework.web.servlet.handler.UserRoleAuthorizationInterceptor">
-				<property name="authorizedRoles" value="ROLE_USER"/>
-			</bean>
+			<bean class="org.springframework.web.servlet.theme.ThemeChangeInterceptor"/>
 		</mvc:interceptor>
 	</mvc:interceptors>
 	<!-- end::snippet[] -->
@@ -7,21 +7,21 @@ javaPlatform {
 }

 dependencies {
-	api(platform("com.fasterxml.jackson:jackson-bom:2.18.2"))
-	api(platform("io.micrometer:micrometer-bom:1.14.3"))
-	api(platform("io.netty:netty-bom:4.1.117.Final"))
+	api(platform("com.fasterxml.jackson:jackson-bom:2.18.1"))
+	api(platform("io.micrometer:micrometer-bom:1.14.0"))
+	api(platform("io.netty:netty-bom:4.1.115.Final"))
 	api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
-	api(platform("io.projectreactor:reactor-bom:2024.0.2"))
+	api(platform("io.projectreactor:reactor-bom:2024.0.0"))
 	api(platform("io.rsocket:rsocket-bom:1.1.4"))
 	api(platform("org.apache.groovy:groovy-bom:4.0.24"))
-	api(platform("org.apache.logging.log4j:log4j-bom:3.0.0-beta3"))
-	api(platform("org.assertj:assertj-bom:3.27.3"))
-	api(platform("org.eclipse.jetty:jetty-bom:12.1.0.alpha1"))
-	api(platform("org.eclipse.jetty.ee11:jetty-ee11-bom:12.1.0.alpha1"))
-	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0"))
-	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3"))
-	api(platform("org.junit:junit-bom:5.11.4"))
-	api(platform("org.mockito:mockito-bom:5.15.2"))
+	api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
+	api(platform("org.assertj:assertj-bom:3.26.3"))
+	api(platform("org.eclipse.jetty:jetty-bom:12.0.15"))
+	api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.15"))
+	api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1"))
+	api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3"))
+	api(platform("org.junit:junit-bom:5.11.3"))
+	api(platform("org.mockito:mockito-bom:5.14.2"))

 	constraints {
 		api("com.fasterxml:aalto-xml:1.3.2")
@@ -31,21 +31,21 @@ dependencies {
 		api("com.google.code.findbugs:findbugs:3.0.1")
 		api("com.google.code.findbugs:jsr305:3.0.2")
 		api("com.google.code.gson:gson:2.11.0")
-		api("com.google.protobuf:protobuf-java-util:4.29.3")
+		api("com.google.protobuf:protobuf-java-util:4.28.3")
 		api("com.h2database:h2:2.3.232")
 		api("com.jayway.jsonpath:json-path:2.9.0")
-		api("com.networknt:json-schema-validator:1.5.3")
 		api("com.oracle.database.jdbc:ojdbc11:21.9.0.0")
 		api("com.rometools:rome:1.19.0")
 		api("com.squareup.okhttp3:mockwebserver:3.14.9")
+		api("com.squareup.okhttp3:okhttp:3.14.9")
 		api("com.sun.activation:jakarta.activation:2.0.1")
+		api("com.sun.mail:jakarta.mail:2.0.1")
 		api("com.sun.xml.bind:jaxb-core:3.0.2")
 		api("com.sun.xml.bind:jaxb-impl:3.0.2")
 		api("com.sun.xml.bind:jaxb-xjc:3.0.2")
 		api("com.thoughtworks.qdox:qdox:2.1.0")
 		api("com.thoughtworks.xstream:xstream:1.4.21")
 		api("commons-io:commons-io:2.15.0")
-		api("commons-logging:commons-logging:1.3.4")
 		api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
 		api("io.micrometer:context-propagation:1.1.1")
 		api("io.mockk:mockk:1.13.4")
@@ -54,37 +54,38 @@ dependencies {
 		api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
 		api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE")
 		api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
-		api("io.reactivex.rxjava3:rxjava:3.1.10")
+		api("io.reactivex.rxjava3:rxjava:3.1.9")
 		api("io.smallrye.reactive:mutiny:1.10.0")
 		api("io.undertow:undertow-core:2.3.18.Final")
-		api("io.undertow:undertow-servlet:2.3.18.Final")
-		api("io.undertow:undertow-websockets-jsr:2.3.18.Final")
+		api("io.undertow:undertow-servlet:2.3.17.Final")
+		api("io.undertow:undertow-websockets-jsr:2.3.17.Final")
 		api("io.vavr:vavr:0.10.4")
-		api("jakarta.activation:jakarta.activation-api:2.1.3")
-		api("jakarta.annotation:jakarta.annotation-api:3.0.0")
-		api("jakarta.validation:jakarta.validation-api:3.1.0")
+		api("jakarta.activation:jakarta.activation-api:2.0.1")
+		api("jakarta.annotation:jakarta.annotation-api:2.0.0")
 		api("jakarta.ejb:jakarta.ejb-api:4.0.1")
-		api("jakarta.el:jakarta.el-api:6.0.1")
-		api("jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:3.1.1")
-		api("jakarta.faces:jakarta.faces-api:4.1.2")
+		api("jakarta.el:jakarta.el-api:4.0.0")
+		api("jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:2.0.0")
+		api("jakarta.faces:jakarta.faces-api:3.0.0")
 		api("jakarta.inject:jakarta.inject-api:2.0.1")
 		api("jakarta.inject:jakarta.inject-tck:2.0.1")
-		api("jakarta.interceptor:jakarta.interceptor-api:2.2.0")
-		api("jakarta.jms:jakarta.jms-api:3.1.0")
-		api("jakarta.json.bind:jakarta.json.bind-api:3.0.1")
-		api("jakarta.json:jakarta.json-api:2.1.3")
-		api("jakarta.mail:jakarta.mail-api:2.1.3")
-		api("jakarta.persistence:jakarta.persistence-api:3.2.0")
-		api("jakarta.resource:jakarta.resource-api:2.1.0")
-		api("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.2")
-		api("jakarta.servlet.jsp:jakarta.servlet.jsp-api:4.0.0")
-		api("jakarta.servlet:jakarta.servlet-api:6.1.0")
+		api("jakarta.interceptor:jakarta.interceptor-api:2.0.0")
+		api("jakarta.jms:jakarta.jms-api:3.0.0")
+		api("jakarta.json.bind:jakarta.json.bind-api:2.0.0")
+		api("jakarta.json:jakarta.json-api:2.0.1")
+		api("jakarta.mail:jakarta.mail-api:2.0.1")
+		api("jakarta.persistence:jakarta.persistence-api:3.0.0")
+		api("jakarta.resource:jakarta.resource-api:2.0.0")
+		api("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0")
+		api("jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.1")
+		api("jakarta.servlet:jakarta.servlet-api:6.0.0")
 		api("jakarta.transaction:jakarta.transaction-api:2.0.1")
-		api("jakarta.validation:jakarta.validation-api:3.1.0")
-		api("jakarta.websocket:jakarta.websocket-api:2.2.0")
-		api("jakarta.websocket:jakarta.websocket-client-api:2.2.0")
+		api("jakarta.validation:jakarta.validation-api:3.0.2")
+		api("jakarta.websocket:jakarta.websocket-api:2.1.0")
+		api("jakarta.websocket:jakarta.websocket-client-api:2.1.0")
 		api("jakarta.xml.bind:jakarta.xml.bind-api:3.0.1")
+		api("javax.annotation:javax.annotation-api:1.3.2")
 		api("javax.cache:cache-api:1.1.1")
+		api("javax.inject:javax.inject:1")
 		api("javax.money:money-api:1.1")
 		api("jaxen:jaxen:1.2.0")
 		api("junit:junit:4.13.2")
@@ -102,10 +103,10 @@ dependencies {
 		api("org.apache.httpcomponents.client5:httpclient5:5.4.1")
 		api("org.apache.httpcomponents.core5:httpcore5-reactive:5.3.1")
 		api("org.apache.poi:poi-ooxml:5.2.5")
-		api("org.apache.tomcat.embed:tomcat-embed-core:11.0.1")
-		api("org.apache.tomcat.embed:tomcat-embed-websocket:11.0.1")
-		api("org.apache.tomcat:tomcat-util:11.0.1")
-		api("org.apache.tomcat:tomcat-websocket:11.0.1")
+		api("org.apache.tomcat.embed:tomcat-embed-core:10.1.28")
+		api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.28")
+		api("org.apache.tomcat:tomcat-util:10.1.28")
+		api("org.apache.tomcat:tomcat-websocket:10.1.28")
 		api("org.aspectj:aspectjrt:1.9.22.1")
 		api("org.aspectj:aspectjtools:1.9.22.1")
 		api("org.aspectj:aspectjweaver:1.9.22.1")
@@ -115,24 +116,23 @@ dependencies {
 		api("org.crac:crac:1.4.0")
 		api("org.dom4j:dom4j:2.1.4")
 		api("org.easymock:easymock:5.4.0")
-		api("org.eclipse.angus:angus-mail:2.0.3")
 		api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.8")
-		api("org.eclipse.persistence:org.eclipse.persistence.jpa:5.0.0-B04")
-		api("org.eclipse:yasson:3.0.4")
+		api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4")
+		api("org.eclipse:yasson:2.0.4")
 		api("org.ehcache:ehcache:3.10.8")
 		api("org.ehcache:jcache:1.0.1")
 		api("org.freemarker:freemarker:2.3.33")
 		api("org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea")
 		api("org.glassfish:jakarta.el:4.0.2")
+		api("org.glassfish.tyrus:tyrus-container-servlet:2.1.3")
 		api("org.graalvm.sdk:graal-sdk:22.3.1")
 		api("org.hamcrest:hamcrest:2.2")
-		api("org.hibernate.orm:hibernate-core:7.0.0.Beta3")
-		api("org.hibernate.validator:hibernate-validator:9.0.0.CR1")
+		api("org.hibernate:hibernate-core-jakarta:5.6.15.Final")
+		api("org.hibernate:hibernate-validator:7.0.5.Final")
 		api("org.hsqldb:hsqldb:2.7.4")
 		api("org.htmlunit:htmlunit:4.6.0")
 		api("org.javamoney:moneta:1.4.4")
 		api("org.jruby:jruby:9.4.9.0")
-		api("org.jspecify:jspecify:1.0.0")
 		api("org.junit.support:testng-engine:1.0.5")
 		api("org.mozilla:rhino:1.7.15")
 		api("org.ogce:xpp3:1.1.6")
@@ -140,9 +140,11 @@ dependencies {
 		api("org.quartz-scheduler:quartz:2.3.2")
 		api("org.seleniumhq.selenium:htmlunit3-driver:4.26.0")
 		api("org.seleniumhq.selenium:selenium-java:4.26.0")
-		api("org.skyscreamer:jsonassert:2.0-rc1")
+		api("org.skyscreamer:jsonassert:1.5.3")
+		api("org.slf4j:slf4j-api:2.0.16")
 		api("org.testng:testng:7.10.2")
 		api("org.webjars:underscorejs:1.8.3")
+		api("org.webjars:webjars-locator-core:0.55")
 		api("org.webjars:webjars-locator-lite:1.0.0")
 		api("org.xmlunit:xmlunit-assertj:2.10.0")
 		api("org.xmlunit:xmlunit-matchers:2.10.0")
@@ -1,10 +1,10 @@
-version=7.0.0-M1
+version=6.2.0

 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.parallel=true

-kotlinVersion=2.1.0
+kotlinVersion=1.9.25

 kotlin.jvm.target.validation.mode=ignore
 kotlin.stdlib.default.dependency=false
--- a/Show More
+++ b/Show More