Release v6.1.10

Prior to this commit, the fix for gh-32575 introduced cases where the
client observation would be stopped twice.

This commit ensures that `RestClient` observations are stopped only once
when the response is closed, or before throwing an unhanlded exception.

Fixes gh-33068

.github/actions/send-notification/action.yml

@@ -0,0 +1,33 @@
+name: Send notification
+description: Sends a Google Chat message as a notification of the job's outcome
+inputs:
+  webhook-url:
+    description: 'Google Chat Webhook URL'
+    required: true
+  status:
+    description: 'Status of the job'
+    required: true
+  build-scan-url:
+    description: 'URL of the build scan to include in the notification'
+  run-name:
+    description: 'Name of the run to include in the notification'
+    default: ${{ format('{0} {1}', github.ref_name, github.job) }}
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        echo "BUILD_SCAN=${{ inputs.build-scan-url == '' && ' [build scan unavailable]' || format(' [<{0}|Build Scan>]', inputs.build-scan-url) }}" >> "$GITHUB_ENV"
+        echo "RUN_URL=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> "$GITHUB_ENV"
+    - shell: bash
+      if: ${{ inputs.status == 'success' }}
+      run: |
+        curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was successful ${{ env.BUILD_SCAN }}"}' || true
+    - shell: bash
+      if: ${{ inputs.status == 'failure' }}
+      run: |
+        curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<users/all> *<${{ env.RUN_URL }}|${{ inputs.run-name }}> failed* ${{ env.BUILD_SCAN }}"}' || true
+    - shell: bash
+      if: ${{ inputs.status == 'cancelled' }}
+      run: |
+        curl -X POST '${{ inputs.webhook-url }}' -H 'Content-Type: application/json' -d '{ text: "<${{ env.RUN_URL }}|${{ inputs.run-name }}> was cancelled"}' || true

.github/workflows/backport-bot.yml

@@ -18,11 +18,13 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Set up Java
+        uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: 'liberica'
+          java-version: 17
       - name: Download BackportBot
         run: wget https://github.com/spring-io/backport-bot/releases/download/latest/backport-bot-0.0.1-SNAPSHOT.jar
       - name: Backport

.github/workflows/build-and-deploy-snapshot.yml

@@ -0,0 +1,62 @@
+name: Build and deploy snapshot
+on:
+  push:
+    branches:
+      - 6.1.x
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+jobs:
+  build-and-deploy-snapshot:
+    if: ${{ github.repository == 'spring-projects/spring-framework' }}
+    name: Build and deploy snapshot
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'liberica'
+          java-version: 17
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
+        with:
+          cache-read-only: false
+      - name: Configure Gradle properties
+        shell: bash
+        run: |
+          mkdir -p $HOME/.gradle
+          echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
+          echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
+          echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
+          echo 'org.gradle.daemon=4' >> $HOME/.gradle/gradle.properties
+      - name: Build and publish
+        id: build
+        env:
+          CI: 'true'
+          GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+        run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository build publishAllPublicationsToDeploymentRepository
+      - name: Deploy
+        uses: spring-io/artifactory-deploy-action@v0.0.1
+        with:
+          uri: 'https://repo.spring.io'
+          username: ${{ secrets.ARTIFACTORY_USERNAME }}
+          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          build-name: ${{ format('spring-framework-{0}', github.ref_name)}}
+          repository: 'libs-snapshot-local'
+          folder: 'deployment-repository'
+          signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
+          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
+      - name: Send notification
+        uses: ./.github/actions/send-notification
+        if: always()
+        with:
+          webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
+          status: ${{ job.status }}
+          build-scan-url: ${{ steps.build.outputs.build-scan-url }}
+          run-name: ${{ format('{0} | Linux | Java 17', github.ref_name) }}

.github/workflows/ci.yml

@@ -0,0 +1,78 @@
+name: CI
+on:
+  push:
+    branches:
+      - 6.1.x
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+jobs:
+  ci:
+    if: ${{ github.repository == 'spring-projects/spring-framework' }}
+    strategy:
+      matrix:
+        os:
+          - id: ubuntu-latest
+            name: Linux
+        java:
+          - version: 17
+            toolchain: false
+          - version: 21
+            toolchain: true
+        exclude:
+          - os:
+              name: Linux
+            java:
+              version: 17
+    name: '${{ matrix.os.name}} | Java ${{ matrix.java.version}}'
+    runs-on: ${{ matrix.os.id }}
+    steps:
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'liberica'
+          java-version: |
+            ${{ matrix.java.version }}
+            ${{ matrix.java.toolchain && '17' || '' }}
+      - name: Prepare Windows runner
+        if: ${{ runner.os == 'Windows' }}
+        run: |
+          git config --global core.autocrlf true
+          git config --global core.longPaths true
+          Stop-Service -name Docker
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
+        with:
+          cache-read-only: false
+      - name: Configure Gradle properties
+        shell: bash
+        run: |
+          mkdir -p $HOME/.gradle
+          echo 'systemProp.user.name=spring-builds+github' >> $HOME/.gradle/gradle.properties
+          echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
+          echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
+          echo 'org.gradle.daemon=4' >> $HOME/.gradle/gradle.properties
+      - name: Configure toolchain properties
+        if: ${{ matrix.java.toolchain }}
+        shell: bash
+        run: |
+          echo toolchainVersion=${{ matrix.java.version }} >> $HOME/.gradle/gradle.properties
+          echo systemProp.org.gradle.java.installations.auto-detect=false >> $HOME/.gradle/gradle.properties
+          echo systemProp.org.gradle.java.installations.auto-download=false >> $HOME/.gradle/gradle.properties
+          echo systemProp.org.gradle.java.installations.paths=${{ format('$JAVA_HOME_{0}_X64', matrix.java.version) }} >> $HOME/.gradle/gradle.properties
+      - name: Build
+        id: build
+        env:
+          CI: 'true'
+          GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
+        run: ./gradlew check antora
+      - name: Send notification
+        uses: ./.github/actions/send-notification
+        if: always()
+        with:
+          webhook-url: ${{ secrets.GOOGLE_CHAT_WEBHOOK_URL }}
+          status: ${{ job.status }}
+          build-scan-url: ${{ steps.build.outputs.build-scan-url }}
+          run-name: ${{ format('{0} | {1} | Java {2}', github.ref_name, matrix.os.name, matrix.java.version) }}

.github/workflows/deploy-docs.yml

@@ -1,12 +1,14 @@
 name: Deploy Docs
 on:
   push:
-    branches-ignore: [ gh-pages ]
-    tags: '**'
+    branches:
+      - 'main'
+      - '*.x'
+      - '!gh-pages'
+    tags:
+      - 'v*'
   repository_dispatch:
     types: request-build-reference # legacy
-  schedule:
-  - cron: '0 10 * * *' # Once per day at 10am UTC
   workflow_dispatch:
 permissions:
   actions: write
@@ -15,8 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'spring-projects'
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
+    - name: Check out code
+      uses: actions/checkout@v4
       with:
         ref: docs-build
         fetch-depth: 1

.github/workflows/gradle-wrapper-validation.yml

@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/wrapper-validation-action@v2

.gitignore

@@ -51,3 +51,5 @@ atlassian-ide-plugin.xml
 .vscode/
 
 cached-antora-playbook.yml
+
+node_modules

.sdkmanrc

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

CODE_OF_CONDUCT.adoc

@@ -1,44 +0,0 @@
-= Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of fostering an open
-and welcoming community, we pledge to respect all people who contribute through reporting
-issues, posting feature requests, updating documentation, submitting pull requests or
-patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for
-everyone, regardless of level of experience, gender, gender identity and expression,
-sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
-religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic addresses,
-  without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments,
-commits, code, wiki edits, issues, and other contributions that are not aligned to this
-Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors
-that they deem inappropriate, threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to fairly and
-consistently applying these principles to every aspect of managing this project. Project
-maintainers who do not follow or enforce the Code of Conduct may be permanently removed
-from the project team.
-
-This Code of Conduct applies both within project spaces and in public spaces when an
-individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
-contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will
-be reviewed and investigated and will result in a response that is deemed necessary and
-appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
-with regard to the reporter of an incident.
-
-This Code of Conduct is adapted from the
-https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
-https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]

CONTRIBUTING.md

@@ -18,7 +18,7 @@ First off, thank you for taking the time to contribute! :+1: :tada:
 
 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@pivotal.io.
+Please report unacceptable behavior to spring-code-of-conduct@spring.io.
 
 ### How to Contribute
 

README.md

@@ -1,4 +1,4 @@
-# <img src="framework-docs/src/docs/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://ci.spring.io/api/v1/teams/spring-framework/pipelines/spring-framework-6.1.x/jobs/build/badge)](https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-6.1.x?groups=Build") [![Revved up by Gradle Enterprise](https://img.shields.io/badge/Revved%20up%20by-Gradle%20Enterprise-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring)
+# <img src="framework-docs/src/docs/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://github.com/spring-projects/spring-framework/actions/workflows/build-and-deploy-snapshot.yml/badge.svg?branch=6.1.x)](https://github.com/spring-projects/spring-framework/actions/workflows/build-and-deploy-snapshot.yml?query=branch%3A6.1.x) [![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.spring.io/scans?search.rootProjectNames=spring)
 
 This is the home of the Spring Framework: the foundation for all [Spring projects](https://spring.io/projects). Collectively the Spring Framework and the family of Spring projects are often referred to simply as "Spring". 
 
@@ -6,7 +6,7 @@ Spring provides everything required beyond the Java programming language for cre
 
 ## Code of Conduct
 
-This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc). By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
+This project is governed by the [Spring Code of Conduct](CODE_OF_CONDUCT.adoc). By participating, you are expected to uphold this code of conduct. Please report unacceptable behavior to spring-code-of-conduct@spring.io.
 
 ## Access to Binaries
 
@@ -31,7 +31,7 @@ Information regarding CI builds can be found in the [Spring Framework Concourse
 
 ## Stay in Touch
 
-Follow [@SpringCentral](https://twitter.com/springcentral), [@SpringFramework](https://twitter.com/springframework), and its [team members](https://twitter.com/springframework/lists/team/members) on Twitter. In-depth articles can be found at [The Spring Blog](https://spring.io/blog/), and releases are announced via our [releases feed](https://spring.io/blog/category/releases).
+Follow [@SpringCentral](https://twitter.com/springcentral), [@SpringFramework](https://twitter.com/springframework), and its [team members](https://twitter.com/springframework/lists/team/members) on 𝕏. In-depth articles can be found at [The Spring Blog](https://spring.io/blog/), and releases are announced via our [releases feed](https://spring.io/blog/category/releases).
 
 ## License
 

build.gradle

@@ -4,7 +4,7 @@ plugins {
 	id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false
 	id 'org.jetbrains.dokka' version '1.8.20'
 	id 'org.unbroken-dome.xjc' version '2.0.0' apply false
-	id 'com.github.ben-manes.versions' version '0.49.0'
+	id 'com.github.ben-manes.versions' version '0.51.0'
 	id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 	id 'de.undercouch.download' version '5.4.0'
 	id 'me.champeau.jmh' version '0.7.2' apply false
@@ -89,9 +89,6 @@ configure([rootProject] + javaProjects) { project ->
 	ext.javadocLinks = [
 			"https://docs.oracle.com/en/java/javase/17/docs/api/",
 			"https://jakarta.ee/specifications/platform/9/apidocs/",
-			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ and weblogic.* packages
-			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/", // com.ibm.*
-			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/", // org.jboss.resource.*
 			"https://docs.jboss.org/hibernate/orm/5.6/javadocs/",
 			"https://eclipse.dev/aspectj/doc/released/aspectj5rt-api",
 			"https://www.quartz-scheduler.org/api/2.3.0/",
@@ -104,7 +101,7 @@ 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.10.1/api/",
+			// "https://junit.org/junit5/docs/5.10.2/api/",
 			"https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/",
 			//"https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/",
 			"https://r2dbc.io/spec/1.0.0.RELEASE/api/",

buildSrc/gradle.properties

@@ -1,2 +1,2 @@
 org.gradle.caching=true
-javaFormatVersion=0.0.39
+javaFormatVersion=0.0.42

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 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,12 +50,12 @@ 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.12.5");
+			checkstyle.setToolVersion("10.17.0");
 			checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
 			String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
 			DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();
-			checkstyleDependencies
-				.add(project.getDependencies().create("io.spring.javaformat:spring-javaformat-checkstyle:" + version));
+			checkstyleDependencies.add(
+					project.getDependencies().create("io.spring.javaformat:spring-javaformat-checkstyle:" + version));
 		});
 	}
 
@@ -64,7 +64,7 @@ public class CheckstyleConventions {
 		NoHttpExtension noHttp = project.getExtensions().getByType(NoHttpExtension.class);
 		noHttp.setAllowlistFile(project.file("src/nohttp/allowlist.lines"));
 		noHttp.getSource().exclude("**/test-output/**", "**/.settings/**",
-				"**/.classpath", "**/.project", "**/.gradle/**");
+				"**/.classpath", "**/.project", "**/.gradle/**", "**/node_modules/**");
 		List<String> buildFolders = List.of("bin", "build", "out");
 		project.allprojects(subproject -> {
 			Path rootPath = project.getRootDir().toPath();

ci/README.adoc

@@ -1,8 +1,10 @@
 == Spring Framework Concourse pipeline
 
+NOTE: CI is being migrated to GitHub Actions.
+
 The Spring Framework uses https://concourse-ci.org/[Concourse] for its CI build and other automated tasks.
 The Spring team has a dedicated Concourse instance available at https://ci.spring.io with a build pipeline
-for https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-6.0.x[Spring Framework 6.0.x].
+for https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-6.1.x[Spring Framework 6.1.x].
 
 === Setting up your development environment
 
@@ -51,7 +53,7 @@ The pipeline can be deployed using the following command:
 
 [source]
 ----
-$ fly -t spring set-pipeline -p spring-framework-6.0.x -c ci/pipeline.yml -l ci/parameters.yml
+$ fly -t spring set-pipeline -p spring-framework-6.1.x -c ci/pipeline.yml -l ci/parameters.yml
 ----
 
 NOTE: This assumes that you have credhub integration configured with the appropriate secrets.

ci/images/ci-image/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:jammy-20231128
+FROM ubuntu:jammy-20240125
 
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
@@ -7,6 +7,6 @@ RUN ./setup.sh
 ENV JAVA_HOME /opt/openjdk/java17
 ENV JDK17 /opt/openjdk/java17
 ENV JDK21 /opt/openjdk/java21
-ENV JDK22 /opt/openjdk/java22
+ENV JDK23 /opt/openjdk/java23
 
 ENV PATH $JAVA_HOME/bin:$PATH

ci/images/get-jdk-url.sh

@@ -3,13 +3,13 @@ set -e
 
 case "$1" in
 	java17)
-		echo "https://download.bell-sw.com/java/17.0.9+11/bellsoft-jdk17.0.9+11-linux-amd64.tar.gz"
+		echo "https://github.com/bell-sw/Liberica/releases/download/17.0.10%2B13/bellsoft-jdk17.0.10+13-linux-amd64.tar.gz"
 	;;
 	java21)
-		echo "https://download.bell-sw.com/java/21.0.1+12/bellsoft-jdk21.0.1+12-linux-amd64.tar.gz"
+		echo "https://github.com/bell-sw/Liberica/releases/download/21.0.2%2B14/bellsoft-jdk21.0.2+14-linux-amd64.tar.gz"
 	;;
-	java22)
-		echo "https://download.java.net/java/early_access/jdk22/27/GPL/openjdk-22-ea+27_linux-x64_bin.tar.gz"
+	java23)
+		echo "https://download.java.net/java/early_access/jdk23/17/GPL/openjdk-23-ea+17_linux-x64_bin.tar.gz"
 	;;
 	*)
 		echo $"Unknown java version"

ci/images/setup.sh

@@ -20,7 +20,7 @@ curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/c
 
 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java17 java21 java22
+for jdk in java17 java21 java23
 do
   JDK_URL=$( /get-jdk-url.sh $jdk )
   mkdir $jdk

ci/parameters.yml

@@ -3,9 +3,8 @@ github-repo-name: "spring-projects/spring-framework"
 sonatype-staging-profile: "org.springframework"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
-branch: "main"
+branch: "6.1.x"
 milestone: "6.1.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
-task-timeout: 1h00m

ci/pipeline.yml

@@ -5,12 +5,10 @@ anchors:
     password: ((github-ci-release-token))
     branch: ((branch))
   gradle-enterprise-task-params: &gradle-enterprise-task-params
-    GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
-    GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
-    GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
+    DEVELOCITY_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
   sonatype-task-params: &sonatype-task-params
-    SONATYPE_USERNAME: ((sonatype-username))
-    SONATYPE_PASSWORD: ((sonatype-password))
+    SONATYPE_USERNAME: ((s01-user-token))
+    SONATYPE_PASSWORD: ((s01-user-token-password))
     SONATYPE_URL: ((sonatype-url))
     SONATYPE_STAGING_PROFILE: ((sonatype-staging-profile))
   artifactory-task-params: &artifactory-task-params
@@ -23,14 +21,6 @@ anchors:
   docker-resource-source: &docker-resource-source
     username: ((docker-hub-username))
     password: ((docker-hub-password))
-  slack-fail-params: &slack-fail-params
-    text: >
-      :concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>
-      [$TEXT_FILE_CONTENT]
-    text_file: git-repo/build/build-scan-uri.txt
-    silent: true
-    icon_emoji: ":concourse:"
-    username: concourse-ci
   changelog-task-params: &changelog-task-params
     name: generated-changelog/tag
     tag: generated-changelog/tag
@@ -64,12 +54,6 @@ resource_types:
     <<: *docker-resource-source
     repository: dpb587/github-status-resource
     tag: master
-- name: slack-notification
-  type: registry-image
-  source:
-    <<: *docker-resource-source
-    repository: cfcommunity/slack-notification-resource
-    tag: latest
 resources:
 - name: git-repo
   type: git
@@ -90,13 +74,6 @@ resources:
     <<: *docker-resource-source
     repository: ((docker-hub-organization))/spring-framework-ci
     tag: ((milestone))
-- name: every-morning
-  type: time
-  icon: alarm
-  source:
-    start: 8:00 AM
-    stop: 9:00 AM
-    location: Europe/Vienna
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant
@@ -105,35 +82,6 @@ resources:
     username: ((artifactory-username))
     password: ((artifactory-password))
     build_name: ((build-name))
-- name: repo-status-build
-  type: github-status-resource
-  icon: eye-check-outline
-  source:
-    repository: ((github-repo-name))
-    access_token: ((github-ci-status-token))
-    branch: ((branch))
-    context: build
-- name: repo-status-jdk21-build
-  type: github-status-resource
-  icon: eye-check-outline
-  source:
-    repository: ((github-repo-name))
-    access_token: ((github-ci-status-token))
-    branch: ((branch))
-    context: jdk21-build
-- name: repo-status-jdk22-build
-  type: github-status-resource
-  icon: eye-check-outline
-  source:
-    repository: ((github-repo-name))
-    access_token: ((github-ci-status-token))
-    branch: ((branch))
-    context: jdk22-build
-- name: slack-alert
-  type: slack-notification
-  icon: slack
-  source:
-    url: ((slack-webhook-url))
 - name: github-pre-release
   type: github-release
   icon: briefcase-download-outline
@@ -168,113 +116,6 @@ jobs:
     - put: ci-image
       params:
         image: ci-image/image.tar
-- name: build
-  serial: true
-  public: true
-  plan:
-  - get: ci-image
-  - get: git-repo
-    trigger: true
-  - put: repo-status-build
-    params: { state: "pending", commit: "git-repo" }
-  - do:
-    - task: build-project
-      image: ci-image
-      file: git-repo/ci/tasks/build-project.yml
-      privileged: true
-      timeout: ((task-timeout))
-      params:
-        <<: *build-project-task-params
-    on_failure:
-      do:
-      - put: repo-status-build
-        params: { state: "failure", commit: "git-repo" }
-      - put: slack-alert
-        params:
-          <<: *slack-fail-params
-  - put: repo-status-build
-    params: { state: "success", commit: "git-repo" }
-  - put: artifactory-repo
-    params: &artifactory-params
-      signing_key: ((signing-key))
-      signing_passphrase: ((signing-passphrase))
-      repo: libs-snapshot-local
-      folder: distribution-repository
-      build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}"
-      build_number: "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}"
-      disable_checksum_uploads: true
-      threads: 8
-      artifact_set:
-      - include:
-        - "/**/framework-api-*.zip"
-        properties:
-          "zip.name": "spring-framework"
-          "zip.displayname": "Spring Framework"
-          "zip.deployed": "false"
-      - include:
-        - "/**/framework-api-*-docs.zip"
-        properties:
-          "zip.type": "docs"
-      - include:
-        - "/**/framework-api-*-schema.zip"
-        properties:
-          "zip.type": "schema"
-    get_params:
-      threads: 8
-- name: jdk21-build
-  serial: true
-  public: true
-  plan:
-    - get: ci-image
-    - get: git-repo
-    - get: every-morning
-      trigger: true
-    - put: repo-status-jdk21-build
-      params: { state: "pending", commit: "git-repo" }
-    - do:
-        - task: check-project
-          image: ci-image
-          file: git-repo/ci/tasks/check-project.yml
-          privileged: true
-          timeout: ((task-timeout))
-          params:
-            TEST_TOOLCHAIN: 21
-            <<: *build-project-task-params
-      on_failure:
-        do:
-          - put: repo-status-jdk21-build
-            params: { state: "failure", commit: "git-repo" }
-          - put: slack-alert
-            params:
-              <<: *slack-fail-params
-    - put: repo-status-jdk21-build
-      params: { state: "success", commit: "git-repo" }
-- name: jdk22-build
-  serial: true
-  public: true
-  plan:
-    - get: ci-image
-    - get: git-repo
-    - put: repo-status-jdk22-build
-      params: { state: "pending", commit: "git-repo" }
-    - do:
-        - task: check-project
-          image: ci-image
-          file: git-repo/ci/tasks/check-project.yml
-          privileged: true
-          timeout: ((task-timeout))
-          params:
-            TEST_TOOLCHAIN: 22
-            <<: *build-project-task-params
-      on_failure:
-        do:
-          - put: repo-status-jdk22-build
-            params: { state: "failure", commit: "git-repo" }
-          - put: slack-alert
-            params:
-              <<: *slack-fail-params
-    - put: repo-status-jdk22-build
-      params: { state: "success", commit: "git-repo" }
 - name: stage-milestone
   serial: true
   plan:
@@ -288,9 +129,32 @@ jobs:
         RELEASE_TYPE: M
         <<: *gradle-enterprise-task-params
     - put: artifactory-repo
-      params:
-        <<: *artifactory-params
+      params: &artifactory-params
+        signing_key: ((signing-key))
+        signing_passphrase: ((signing-passphrase))
         repo: libs-staging-local
+        folder: distribution-repository
+        build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}"
+        build_number: "${BUILD_PIPELINE_NAME}-${BUILD_JOB_NAME}-${BUILD_NAME}"
+        disable_checksum_uploads: true
+        threads: 8
+        artifact_set:
+          - include:
+              - "/**/framework-api-*.zip"
+            properties:
+              "zip.name": "spring-framework"
+              "zip.displayname": "Spring Framework"
+              "zip.deployed": "false"
+          - include:
+              - "/**/framework-api-*-docs.zip"
+            properties:
+              "zip.type": "docs"
+          - include:
+              - "/**/framework-api-*-schema.zip"
+            properties:
+              "zip.type": "schema"
+      get_params:
+        threads: 8
     - put: git-repo
       params:
         repository: stage-git-repo
@@ -335,7 +199,6 @@ jobs:
     - put: artifactory-repo
       params:
         <<: *artifactory-params
-        repo: libs-staging-local
     - put: git-repo
       params:
         repository: stage-git-repo
@@ -380,7 +243,6 @@ jobs:
     - put: artifactory-repo
       params:
         <<: *artifactory-params
-        repo: libs-staging-local
     - put: git-repo
       params:
         repository: stage-git-repo
@@ -425,8 +287,6 @@ jobs:
         <<: *changelog-task-params
 
 groups:
-- name: "builds"
-  jobs: ["build", "jdk21-build", "jdk22-build"]
 - name: "releases"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"

ci/scripts/build-pr.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-
-source $(dirname $0)/common.sh
-
-pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK21 \
-  --no-daemon --max-workers=4 check
-popd > /dev/null

ci/scripts/build-project.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-source $(dirname $0)/common.sh
-repository=$(pwd)/distribution-repository
-
-pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK21,JDK22 \
-  --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
-popd > /dev/null

ci/scripts/check-project.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-
-source $(dirname $0)/common.sh
-
-pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK21 \
-  -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check antora
-popd > /dev/null

ci/tasks/build-pr.yml

@@ -1,19 +0,0 @@
----
-platform: linux
-inputs:
-- name: git-repo
-caches:
-- path: gradle
-params:
-  BRANCH:
-  CI: true
-  GRADLE_ENTERPRISE_ACCESS_KEY:
-  GRADLE_ENTERPRISE_CACHE_USERNAME:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD:
-  GRADLE_ENTERPRISE_URL: https://ge.spring.io
-run:
-  path: bash
-  args:
-    - -ec
-    - |
-      ${PWD}/git-repo/ci/scripts/build-pr.sh

ci/tasks/build-project.yml

@@ -1,22 +0,0 @@
----
-platform: linux
-inputs:
-- name: git-repo
-outputs:
-- name: distribution-repository
-- name: git-repo
-caches:
-- path: gradle
-params:
-  BRANCH:
-  CI: true
-  GRADLE_ENTERPRISE_ACCESS_KEY:
-  GRADLE_ENTERPRISE_CACHE_USERNAME:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD:
-  GRADLE_ENTERPRISE_URL: https://ge.spring.io
-run:
-  path: bash
-  args:
-    - -ec
-    - |
-      ${PWD}/git-repo/ci/scripts/build-project.sh

ci/tasks/check-project.yml

@@ -1,24 +0,0 @@
----
-platform: linux
-inputs:
-- name: git-repo
-outputs:
-- name: distribution-repository
-- name: git-repo
-caches:
-- path: gradle
-params:
-  BRANCH:
-  CI: true
-  MAIN_TOOLCHAIN:
-  TEST_TOOLCHAIN:
-  GRADLE_ENTERPRISE_ACCESS_KEY:
-  GRADLE_ENTERPRISE_CACHE_USERNAME:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD:
-  GRADLE_ENTERPRISE_URL: https://ge.spring.io
-run:
-  path: bash
-  args:
-    - -ec
-    - |
-      ${PWD}/git-repo/ci/scripts/check-project.sh

framework-api/framework-api.gradle

@@ -28,7 +28,7 @@ javadoc {
 		header = rootProject.description
 		use = true
 		overview = project.relativePath("$rootProject.rootDir/framework-docs/src/docs/api/overview.html")
-		destinationDir = file("${project.buildDir}/docs/javadoc-api")
+		destinationDir = file("$project.docsDir/javadoc-api")
 		splitIndex = true
 		links(rootProject.ext.javadocLinks)
 		addBooleanOption('Xdoclint:syntax,reference', true) // only check syntax and reference with doclint
@@ -52,7 +52,7 @@ rootProject.tasks.dokkaHtmlMultiModule.configure {
 		tasks.named("javadoc")
 	}
 	moduleName.set("spring-framework")
-	outputDirectory.set(project.file("$buildDir/docs/kdoc-api"))
+	outputDirectory.set(file("$docsDir/kdoc-api"))
 	includes.from("$rootProject.rootDir/framework-docs/src/docs/api/dokka-overview.md")
 }
 

framework-docs/antora-playbook.yml

@@ -0,0 +1,39 @@
+antora:
+  extensions:
+  - require: '@springio/antora-extensions'
+    root_component_name: 'framework'
+site:
+  title: Spring Framework
+  url: https://docs.spring.io/spring-framework/reference
+  robots: allow
+git:
+  ensure_git_suffix: false
+content:
+  sources:
+  - url: https://github.com/spring-projects/spring-framework
+    # Refname matching:
+    # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
+    branches: ['main', '{6..9}.+({0..9}).x']
+    tags: ['v{6..9}.+({0..9}).+({0..9})?(-{RC,M}*)', '!(v6.0.{0..8})', '!(v6.0.0-{RC,M}{0..9})']
+    start_path: framework-docs
+asciidoc:
+  extensions:
+    - '@asciidoctor/tabs'
+    - '@springio/asciidoctor-extensions'
+    - '@springio/asciidoctor-extensions/include-code-extension'
+  attributes:
+    page-stackoverflow-url: https://stackoverflow.com/questions/tagged/spring
+    page-pagination: ''
+    hide-uri-scheme: '@'
+    tabs-sync-option: '@'
+    include-java: 'example$docs-src/main/java/org/springframework/docs'
+urls:
+  latest_version_segment_strategy: redirect:to
+  latest_version_segment: ''
+  redirect_facility: httpd
+runtime:
+  log:
+    failure_level: warn
+ui:
+  bundle:
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip

framework-docs/antora.yml

@@ -18,6 +18,7 @@ asciidoc:
     # FIXME: The package is not renamed
     chomp: 'all'
     fold: 'all'
+    table-stripes: 'odd'
     include-java: 'example$docs-src/main/java/org/springframework/docs'
     spring-site: 'https://spring.io'
     spring-site-blog: '{spring-site}/blog'

framework-docs/framework-docs.gradle

@@ -10,27 +10,10 @@ apply from: "${rootDir}/gradle/ide.gradle"
 apply from: "${rootDir}/gradle/publications.gradle"
 
 antora {
-	version = '3.2.0-alpha.2'
-	playbook = 'cached-antora-playbook.yml'
-	playbookProvider {
-		repository = 'spring-projects/spring-framework'
-		branch = 'docs-build'
-		path = 'lib/antora/templates/per-branch-antora-playbook.yml'
-		checkLocalBranch = true
-	}
-	options = ['--clean', '--stacktrace']
+	options = [clean: true, fetch: !project.gradle.startParameter.offline, stacktrace: true]
 	environment = [
-			'ALGOLIA_API_KEY': '82c7ead946afbac3cf98c32446154691',
-			'ALGOLIA_APP_ID': '244V8V9FGG',
-			'ALGOLIA_INDEX_NAME': 'framework-docs'
-	]
-	dependencies = [
-			'@antora/atlas-extension': '1.0.0-alpha.1',
-			'@antora/collector-extension': '1.0.0-alpha.3',
-			'@asciidoctor/tabs': '1.0.0-beta.3',
-			'@opendevise/antora-release-line-extension': '1.0.0-alpha.2',
-			'@springio/antora-extensions': '1.3.0',
-			'@springio/asciidoctor-extensions': '1.0.0-alpha.9'
+			'BUILD_REFNAME': 'HEAD',
+			'BUILD_VERSION': project.version,
 	]
 }
 

framework-docs/modules/ROOT/nav.adoc

@@ -39,8 +39,8 @@
 ** xref:core/resources.adoc[]
 ** xref:core/validation.adoc[]
 *** xref:core/validation/validator.adoc[]
-*** xref:core/validation/conversion.adoc[]
 *** xref:core/validation/beans-beans.adoc[]
+*** xref:core/validation/conversion.adoc[]
 *** xref:core/validation/convert.adoc[]
 *** xref:core/validation/format.adoc[]
 *** xref:core/validation/format-configuring-formatting-globaldatetimeformat.adoc[]
@@ -421,7 +421,7 @@
 *** xref:integration/cache/specific-config.adoc[]
 ** xref:integration/observability.adoc[]
 ** xref:integration/checkpoint-restore.adoc[]
-** xref:integration/class-data-sharing.adoc[]
+** xref:integration/cds.adoc[]
 ** xref:integration/appendix.adoc[]
 * xref:languages.adoc[]
 ** xref:languages/kotlin.adoc[]
@@ -439,4 +439,5 @@
 ** xref:languages/groovy.adoc[]
 ** xref:languages/dynamic.adoc[]
 * xref:appendix.adoc[]
-* {spring-framework-wiki}[Wiki]
+* {spring-framework-wiki}[Wiki]
+

framework-docs/modules/ROOT/pages/appendix.adoc

@@ -19,15 +19,53 @@ of the classpath -- for example, deployed within the application's JAR file.
 The following table lists all currently supported Spring properties.
 
 .Supported Spring Properties
+[cols="1,1"]
 |===
 | Name | Description
 
+| `spring.aot.enabled`
+| Indicates the application should run with AOT generated artifacts. See
+xref:core/aot.adoc[Ahead of Time Optimizations] and 
+{spring-framework-api}++/aot/AotDetector.html#AOT_ENABLED++[`AotDetector`]
+for details.
+
 | `spring.beaninfo.ignore`
 | Instructs Spring to use the `Introspector.IGNORE_ALL_BEANINFO` mode when calling the
 JavaBeans `Introspector`. See
 {spring-framework-api}++/beans/StandardBeanInfoFactory.html#IGNORE_BEANINFO_PROPERTY_NAME++[`CachedIntrospectionResults`]
 for details.
 
+| `spring.cache.reactivestreams.ignore`
+| Instructs Spring's caching infrastructure to ignore the presence of Reactive Streams,
+in particular Reactor's `Mono`/`Flux` in `@Cacheable` method return type declarations. See
+{spring-framework-api}++/cache/interceptor/CacheAspectSupport.html#IGNORE_REACTIVESTREAMS_PROPERTY_NAME++[`CacheAspectSupport`]
+for details.
+
+| `spring.classformat.ignore`
+| Instructs Spring to ignore class format exceptions during classpath scanning, in
+particular for unsupported class file versions. See
+{spring-framework-api}++/context/annotation/ClassPathScanningCandidateComponentProvider.html#IGNORE_CLASSFORMAT_PROPERTY_NAME++[`ClassPathScanningCandidateComponentProvider`]
+for details.
+
+| `spring.context.checkpoint`
+| Property that specifies a common context checkpoint. See
+xref:integration/checkpoint-restore.adoc#_automatic_checkpointrestore_at_startup[Automatic
+checkpoint/restore at startup] and
+{spring-framework-api}++/context/support/DefaultLifecycleProcessor.html#CHECKPOINT_PROPERTY_NAME++[`DefaultLifecycleProcessor`]
+for details.
+
+| `spring.context.exit`
+| Property for terminating the JVM when the context reaches a specific phase. See
+xref:integration/checkpoint-restore.adoc#_automatic_checkpointrestore_at_startup[Automatic
+checkpoint/restore at startup] and
+{spring-framework-api}++/context/support/DefaultLifecycleProcessor.html#EXIT_PROPERTY_NAME++[`DefaultLifecycleProcessor`]
+for details.
+
+| `spring.context.expression.maxLength`
+| The maximum length for
+xref:core/expressions/evaluation.adoc#expressions-parser-configuration[Spring Expression Language]
+expressions used in XML bean definitions, `@Value`, etc.
+
 | `spring.expression.compiler.mode`
 | The mode to use when compiling expressions for the
 xref:core/expressions/evaluation.adoc#expressions-compiler-configuration[Spring Expression Language].

framework-docs/modules/ROOT/pages/core/aop-api/pfb.adoc

@@ -291,6 +291,8 @@ to consider:
 * `final` classes cannot be proxied, because they cannot be extended.
 * `final` methods cannot be advised, because they cannot be overridden.
 * `private` methods cannot be advised, because they cannot be overridden.
+* Methods that are not visible, typically package private methods in a parent class
+from a different package, cannot be advised because they are effectively private.
 
 NOTE: There is no need to add CGLIB to your classpath. CGLIB is repackaged and included
 in the `spring-core` JAR. In other words, CGLIB-based AOP works "out of the box", as do

framework-docs/modules/ROOT/pages/core/aop-api/targetsource.adoc

@@ -168,7 +168,7 @@ Kotlin::
 ======
 
 NOTE: Pooling stateless service objects is not usually necessary. We do not believe it should
-be the default choice, as most stateless objects are naturally thread safe, and instance
+be the default choice, as most stateless objects are naturally thread-safe, and instance
 pooling is problematic if resources are cached.
 
 Simpler pooling is available by using auto-proxying. You can set the `TargetSource` implementations
@@ -221,8 +221,8 @@ NOTE: `ThreadLocal` instances come with serious issues (potentially resulting in
 incorrectly using them in multi-threaded and multi-classloader environments. You
 should always consider wrapping a `ThreadLocal` in some other class and never directly use
 the `ThreadLocal` itself (except in the wrapper class). Also, you should
-always remember to correctly set and unset (where the latter simply involves a call to
-`ThreadLocal.set(null)`) the resource local to the thread. Unsetting should be done in
+always remember to correctly set and unset (where the latter involves a call to
+`ThreadLocal.remove()`) the resource local to the thread. Unsetting should be done in
 any case, since not unsetting it might result in problematic behavior. Spring's
 `ThreadLocal` support does this for you and should always be considered in favor of using
 `ThreadLocal` instances without other proper handling code.

framework-docs/modules/ROOT/pages/core/aop/proxying.adoc

@@ -19,6 +19,10 @@ you can do so. However, you should consider the following issues:
   since the CGLIB proxy instance is created through Objenesis. Only if your JVM does
   not allow for constructor bypassing, you might see double invocations and
   corresponding debug log entries from Spring's AOP support.
+* Your CGLIB proxy usage may face limitations with the JDK 9+ platform module system.
+  As a typical case, you cannot create a CGLIB proxy for a class from the `java.lang`
+  package when deploying on the module path. Such cases require a JVM bootstrap flag
+  `--add-opens=java.base/java.lang=ALL-UNNAMED` which is not available for modules.
 
 To force the use of CGLIB proxies, set the value of the `proxy-target-class` attribute
 of the `<aop:config>` element to true, as follows:

framework-docs/modules/ROOT/pages/core/aop/using-aspectj.adoc

@@ -521,8 +521,8 @@ standard AspectJ. The following example shows the `aop.xml` file:
 	<aspectj>
 
 		<weaver>
-			<!-- only weave classes in our application-specific packages -->
-			<include within="com.xyz.*"/>
+			<!-- only weave classes in our application-specific packages and sub-packages -->
+			<include within="com.xyz..*"/>
 		</weaver>
 
 		<aspects>
@@ -533,6 +533,11 @@ standard AspectJ. The following example shows the `aop.xml` file:
 	</aspectj>
 ----
 
+NOTE: It is recommended to only weave specific classes (typically those in the
+application packages, as shown in the `aop.xml` example above) in order
+to avoid side effects such as AspectJ dump files and warnings.
+This is also a best practice from an efficiency perspective.
+
 Now we can move on to the Spring-specific portion of the configuration. We need
 to configure a `LoadTimeWeaver` (explained later). This load-time weaver is the
 essential component responsible for weaving the aspect configuration in one or
@@ -714,10 +719,29 @@ Furthermore, the compiled aspect classes need to be available on the classpath.
 
 
 [[aop-aj-ltw-aop_dot_xml]]
-=== 'META-INF/aop.xml'
+=== `META-INF/aop.xml`
 
 The AspectJ LTW infrastructure is configured by using one or more `META-INF/aop.xml`
 files that are on the Java classpath (either directly or, more typically, in jar files).
+For example:
+
+[source,xml,indent=0,subs="verbatim"]
+----
+	<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "https://www.eclipse.org/aspectj/dtd/aspectj.dtd">
+	<aspectj>
+
+		<weaver>
+			<!-- only weave classes in our application-specific packages and sub-packages -->
+			<include within="com.xyz..*"/>
+		</weaver>
+
+	</aspectj>
+----
+
+NOTE: It is recommended to only weave specific classes (typically those in the
+application packages, as shown in the `aop.xml` example above) in order
+to avoid side effects such as AspectJ dump files and warnings.
+This is also a best practice from an efficiency perspective.
 
 The structure and contents of this file is detailed in the LTW part of the
 {aspectj-docs-devguide}/ltw-configuration.html[AspectJ reference

framework-docs/modules/ROOT/pages/core/aot.adoc

@@ -15,10 +15,13 @@ Applying such optimizations early implies the following restrictions:
 
 * The classpath is fixed and fully defined at build time.
 * The beans defined in your application cannot change at runtime, meaning:
-** `@Profile`, in particular profile-specific configuration needs to be chosen at build time.
+** `@Profile`, in particular profile-specific configuration, needs to be chosen at build time and is automatically enabled at runtime when AOT is enabled.
 ** `Environment` properties that impact the presence of a bean (`@Conditional`) are only considered at build time.
-* Bean definitions with instance suppliers (lambdas or method references) cannot be transformed ahead-of-time (see related {spring-framework-issues}/29555[spring-framework#29555] issue).
-* Make sure that the bean type is as precise as possible.
+* Bean definitions with instance suppliers (lambdas or method references) cannot be transformed ahead-of-time.
+* Beans registered as singletons (using `registerSingleton`, typically from
+`ConfigurableListableBeanFactory`) cannot be transformed ahead-of-time either.
+* As we cannot rely on the instance, make sure that the bean type is as precise as
+possible.
 
 TIP: See also the xref:core/aot.adoc#aot.bestpractices[] section.
 
@@ -27,7 +30,7 @@ A Spring AOT processed application typically generates:
 
 * Java source code
 * Bytecode (usually for dynamic proxies)
-* {spring-framework-api}/aot/hint/RuntimeHints.html[`RuntimeHints`] for the use of reflection, resource loading, serialization, and JDK proxies.
+* {spring-framework-api}/aot/hint/RuntimeHints.html[`RuntimeHints`] for the use of reflection, resource loading, serialization, and JDK proxies
 
 NOTE: At the moment, AOT is focused on allowing Spring applications to be deployed as native images using GraalVM.
 We intend to support more JVM-based use cases in future generations.
@@ -35,7 +38,7 @@ We intend to support more JVM-based use cases in future generations.
 [[aot.basics]]
 == AOT engine overview
 
-The entry point of the AOT engine for processing an `ApplicationContext` arrangement is `ApplicationContextAotGenerator`. It takes care of the following steps, based on a `GenericApplicationContext` that represents the application to optimize and a {spring-framework-api}/aot/generate/GenerationContext.html[`GenerationContext`]:
+The entry point of the AOT engine for processing an `ApplicationContext` is `ApplicationContextAotGenerator`. It takes care of the following steps, based on a `GenericApplicationContext` that represents the application to optimize and a {spring-framework-api}/aot/generate/GenerationContext.html[`GenerationContext`]:
 
 * Refresh an `ApplicationContext` for AOT processing. Contrary to a traditional refresh, this version only creates bean definitions, not bean instances.
 * Invoke the available `BeanFactoryInitializationAotProcessor` implementations and apply their contributions against the `GenerationContext`.
@@ -67,7 +70,14 @@ include-code::./AotProcessingSample[tag=aotcontext]
 In this mode, xref:core/beans/factory-extension.adoc#beans-factory-extension-factory-postprocessors[`BeanFactoryPostProcessor` implementations] are invoked as usual.
 This includes configuration class parsing, import selectors, classpath scanning, etc.
 Such steps make sure that the `BeanRegistry` contains the relevant bean definitions for the application.
-If bean definitions are guarded by conditions (such as `@Profile`), these are discarded at this stage.
+If bean definitions are guarded by conditions (such as `@Profile`), these are evaluated,
+and bean definitions that don't match their conditions are discarded at this stage.
+
+If custom code needs to register extra beans programmatically, make sure that custom
+registration code uses `BeanDefinitionRegistry` instead of `BeanFactory` as only bean
+definitions are taken into account. A good pattern is to implement
+`ImportBeanDefinitionRegistrar` and register it via an `@Import` on one of your
+configuration classes.
 
 Because this mode does not actually create bean instances, `BeanPostProcessor` implementations are not invoked, except for specific variants that are relevant for AOT processing.
 These are:
@@ -84,12 +94,12 @@ Once this part completes, the `BeanFactory` contains the bean definitions that a
 Components that want to participate in this step can implement the {spring-framework-api}/beans/factory/aot/BeanFactoryInitializationAotProcessor.html[`BeanFactoryInitializationAotProcessor`] interface.
 Each implementation can return an AOT contribution, based on the state of the bean factory.
 
-An AOT contribution is a component that contributes generated code that reproduces a particular behavior.
+An AOT contribution is a component that contributes generated code which reproduces a particular behavior.
 It can also contribute `RuntimeHints` to indicate the need for reflection, resource loading, serialization, or JDK proxies.
 
-A `BeanFactoryInitializationAotProcessor` implementation can be registered in `META-INF/spring/aot.factories` with a key equal to the fully qualified name of the interface.
+A `BeanFactoryInitializationAotProcessor` implementation can be registered in `META-INF/spring/aot.factories` with a key equal to the fully-qualified name of the interface.
 
-A `BeanFactoryInitializationAotProcessor` can also be implemented directly by a bean.
+The `BeanFactoryInitializationAotProcessor` interface can also be implemented directly by a bean.
 In this mode, the bean provides an AOT contribution equivalent to the feature it provides with a regular runtime.
 Consequently, such a bean is automatically excluded from the AOT-optimized context.
 
@@ -111,7 +121,7 @@ This interface is used as follows:
 
 * Implemented by a `BeanPostProcessor` bean, to replace its runtime behavior.
 For instance xref:core/beans/factory-extension.adoc#beans-factory-extension-bpp-examples-aabpp[`AutowiredAnnotationBeanPostProcessor`] implements this interface to generate code that injects members annotated with `@Autowired`.
-* Implemented by a type registered in `META-INF/spring/aot.factories` with a key equal to the fully qualified name of the interface.
+* Implemented by a type registered in `META-INF/spring/aot.factories` with a key equal to the fully-qualified name of the interface.
 Typically used when the bean definition needs to be tuned for specific features of the core framework.
 
 [NOTE]
@@ -142,8 +152,23 @@ Java::
 
 	}
 ----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	@Configuration(proxyBeanMethods = false)
+	class DataSourceConfiguration {
+
+		@Bean
+		fun dataSource() = SimpleDataSource()
+
+	}
+----
 ======
 
+WARNING: Kotlin class names with backticks that use invalid Java identifiers (not starting with a letter, containing spaces, etc.) are not supported.
+
 Since there isn't any particular condition on this class, `dataSourceConfiguration` and `dataSource` are identified as candidates.
 The AOT engine will convert the configuration class above to code similar to the following:
 
@@ -199,6 +224,17 @@ There is a bean definition for `dataSourceConfiguration` and one for `dataSource
 When a `datasource` instance is required, a `BeanInstanceSupplier` is called.
 This supplier invokes the `dataSource()` method on the `dataSourceConfiguration` bean.
 
+[[aot.running]]
+== Running with AOT optimizations
+
+AOT is a mandatory step to transform a Spring application to a native executable, so it
+is automatically enabled when running in this mode. It is possible to use those optimizations
+on the JVM by setting the `spring.aot.enabled` System property to `true`.
+
+NOTE: When AOT optimizations are included, some decisions that have been taken at build-time
+are hard-coded in the application setup. For instance, profiles that have been enabled at
+build-time are automatically enabled at runtime as well.
+
 [[aot.bestpractices]]
 == Best Practices
 
@@ -207,11 +243,33 @@ However, keep in mind that some optimizations are made at build time based on a
 
 This section lists the best practices that make sure your application is ready for AOT.
 
+[[aot.bestpractices.bean-registration]]
+== Programmatic bean registration
+
+The AOT engine takes care of the `@Configuration` model and any callback that might be
+invoked as part of processing your configuration. If you need to register additional
+beans programmatically, make sure to use a `BeanDefinitionRegistry` to register
+bean definitions.
+
+This can typically be done via a `BeanDefinitionRegistryPostProcessor`. Note that, if it
+is registered itself as a bean, it will be invoked again at runtime unless you make
+sure to implement `BeanFactoryInitializationAotProcessor` as well. A more idiomatic
+way is to implement `ImportBeanDefinitionRegistrar` and register it using `@Import` on
+one of your configuration classes. This invokes your custom code as part of configuration
+class parsing.
+
+If you declare additional beans programmatically using a different callback, they are
+likely not going to be handled by the AOT engine, and therefore no hints are going to be
+generated for them. Depending on the environment, those beans may not be registered at
+all. For instance, classpath scanning does not work in a native image as there is no
+notion of a classpath. For cases like this, it is crucial that the scanning happens at
+build time.
+
 [[aot.bestpractices.bean-type]]
 === Expose The Most Precise Bean Type
 
 While your application may interact with an interface that a bean implements, it is still very important to declare the most precise type.
-The AOT engine performs additional checks on the bean type, such as detecting the presence of `@Autowired` members, or lifecycle callback methods.
+The AOT engine performs additional checks on the bean type, such as detecting the presence of `@Autowired` members or lifecycle callback methods.
 
 For `@Configuration` classes, make sure that the return type of the factory `@Bean` method is as precise as possible.
 Consider the following example:
@@ -262,10 +320,37 @@ If you are registering bean definitions programmatically, consider using `RootBe
 
 [[aot.bestpractices.constructors]]
 === Avoid Multiple Constructors
+
 The container is able to choose the most appropriate constructor to use based on several candidates.
 However, this is not a best practice and flagging the preferred constructor with `@Autowired` if necessary is preferred.
 
-In case you are working on a code base that you can't modify, you can set the {spring-framework-api}/beans/factory/support/AbstractBeanDefinition.html#PREFERRED_CONSTRUCTORS_ATTRIBUTE[`preferredConstructors` attribute] on the related bean definition to indicate which constructor should be used.
+In case you are working on a code base that you cannot modify, you can set the {spring-framework-api}/beans/factory/support/AbstractBeanDefinition.html#PREFERRED_CONSTRUCTORS_ATTRIBUTE[`preferredConstructors` attribute] on the related bean definition to indicate which constructor should be used.
+
+[[aot.bestpractices.comlext-data-structure]]
+=== Avoid Complex Data Structure for Constructor Parameters and Properties
+
+When crafting a `RootBeanDefinition` programmatically, you are not constrained in terms of types that you can use.
+For instance, you may have a custom `record` with several properties that your bean takes as a constructor argument.
+
+While this works fine with the regular runtime, AOT does not know how to generate the code of your custom data structure.
+A good rule of thumb is to keep in mind that bean definitions are an abstraction on top of several models.
+Rather than using such structure, decomposing to simple types or referring to a bean that is built as such is recommended.
+
+As a last resort, you can implement your own `org.springframework.aot.generate.ValueCodeGenerator$Delegate`.
+To use it, register its fully qualified name in `META-INF/spring/aot.factories` using the `Delegate` as the key.
+
+[[aot.bestpractices.custom-arguments]]
+=== Avoid Creating Bean with Custom Arguments
+
+Spring AOT detects what needs to be done to create a bean and translates that in generated code using an instance supplier.
+The container also supports creating a bean with {spring-framework-api}++/beans/factory/BeanFactory.html#getBean(java.lang.String,java.lang.Object...)++[custom arguments] that leads to several issues with AOT:
+
+. The custom arguments require dynamic introspection of a matching constructor or factory method.
+Those arguments cannot be detected by AOT, so the necessary reflection hints will have to be provided manually.
+. By-passing the instance supplier means that all other optimizations after creation are skipped as well.
+For instance, autowiring on fields and methods will be skipped as they are handled in the instance supplier.
+
+Rather than having prototype-scoped beans created with custom arguments, we recommend a manual factory pattern where a bean is responsible for the creation of the instance.
 
 [[aot.bestpractices.factory-bean]]
 === FactoryBean
@@ -283,7 +368,7 @@ Java::
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 ----
 	public class ClientFactoryBean<T extends AbstractClient> implements FactoryBean<T> {
-
+		// ...
 	}
 ----
 ======
@@ -380,7 +465,7 @@ Java::
 
 Running an application as a native image requires additional information compared to a regular JVM runtime.
 For instance, GraalVM needs to know ahead of time if a component uses reflection.
-Similarly, classpath resources are not shipped in a native image unless specified explicitly.
+Similarly, classpath resources are not included in a native image unless specified explicitly.
 Consequently, if the application needs to load a resource, it must be referenced from the corresponding GraalVM native image configuration file.
 
 The {spring-framework-api}/aot/hint/RuntimeHints.html[`RuntimeHints`] API collects the need for reflection, resource loading, serialization, and JDK proxies at runtime.
@@ -415,7 +500,7 @@ include-code::./SpellCheckService[]
 If at all possible, `@ImportRuntimeHints` should be used as close as possible to the component that requires the hints.
 This way, if the component is not contributed to the `BeanFactory`, the hints won't be contributed either.
 
-It is also possible to register an implementation statically by adding an entry in `META-INF/spring/aot.factories` with a key equal to the fully qualified name of the `RuntimeHintsRegistrar` interface.
+It is also possible to register an implementation statically by adding an entry in `META-INF/spring/aot.factories` with a key equal to the fully-qualified name of the `RuntimeHintsRegistrar` interface.
 
 
 [[aot.hints.reflective]]
@@ -424,7 +509,7 @@ It is also possible to register an implementation statically by adding an entry
 {spring-framework-api}/aot/hint/annotation/Reflective.html[`@Reflective`] provides an idiomatic way to flag the need for reflection on an annotated element.
 For instance, `@EventListener` is meta-annotated with `@Reflective` since the underlying implementation invokes the annotated method using reflection.
 
-By default, only Spring beans are considered and an invocation hint is registered for the annotated element.
+By default, only Spring beans are considered, and an invocation hint is registered for the annotated element.
 This can be tuned by specifying a custom `ReflectiveProcessor` implementation via the
 `@Reflective` annotation.
 

framework-docs/modules/ROOT/pages/core/beans/annotation-config.adoc

@@ -1,33 +1,16 @@
 [[beans-annotation-config]]
 = Annotation-based Container Configuration
 
-.Are annotations better than XML for configuring Spring?
-****
-The introduction of annotation-based configuration raised the question of whether this
-approach is "`better`" than XML. The short answer is "`it depends.`" The long answer is
-that each approach has its pros and cons, and, usually, it is up to the developer to
-decide which strategy suits them better. Due to the way they are defined, annotations
-provide a lot of context in their declaration, leading to shorter and more concise
-configuration. However, XML excels at wiring up components without touching their source
-code or recompiling them. Some developers prefer having the wiring close to the source
-while others argue that annotated classes are no longer POJOs and, furthermore, that the
-configuration becomes decentralized and harder to control.
+Spring provides comprehensive support for annotation-based configuration, operating on
+metadata in the component class itself by using annotations on the relevant class,
+method, or field declaration. As mentioned in
+xref:core/beans/factory-extension.adoc#beans-factory-extension-bpp-examples-aabpp[Example: The `AutowiredAnnotationBeanPostProcessor`],
+Spring uses `BeanPostProcessors` in conjunction with annotations to make the core IOC
+container aware of specific annotations.
 
-No matter the choice, Spring can accommodate both styles and even mix them together.
-It is worth pointing out that through its xref:core/beans/java.adoc[JavaConfig] option, Spring lets
-annotations be used in a non-invasive way, without touching the target components'
-source code and that, in terms of tooling, all configuration styles are supported by
-{spring-site-tools}[Spring Tools] for Eclipse, Visual Studio Code, and Theia.
-****
-
-An alternative to XML setup is provided by annotation-based configuration, which relies
-on bytecode metadata for wiring up components instead of XML declarations. Instead of
-using XML to describe a bean wiring, the developer moves the configuration into the
-component class itself by using annotations on the relevant class, method, or field
-declaration. As mentioned in xref:core/beans/factory-extension.adoc#beans-factory-extension-bpp-examples-aabpp[Example: The `AutowiredAnnotationBeanPostProcessor`], using a
-`BeanPostProcessor` in conjunction with annotations is a common means of extending the
-Spring IoC container. For example, the xref:core/beans/annotation-config/autowired.adoc[`@Autowired`]
-annotation provides the same capabilities as described in xref:core/beans/dependencies/factory-autowire.adoc[Autowiring Collaborators] but
+For example, the xref:core/beans/annotation-config/autowired.adoc[`@Autowired`]
+annotation provides the same capabilities as described in
+xref:core/beans/dependencies/factory-autowire.adoc[Autowiring Collaborators] but
 with more fine-grained control and wider applicability. In addition, Spring provides
 support for JSR-250 annotations, such as `@PostConstruct` and `@PreDestroy`, as well as
 support for JSR-330 (Dependency Injection for Java) annotations contained in the
@@ -36,13 +19,16 @@ can be found in the xref:core/beans/standard-annotations.adoc[relevant section].
 
 [NOTE]
 ====
-Annotation injection is performed before XML injection. Thus, the XML configuration
-overrides the annotations for properties wired through both approaches.
+Annotation injection is performed before external property injection. Thus, external
+configuration (e.g. XML-specified bean properties) effectively overrides the annotations
+for properties when wired through mixed approaches.
 ====
 
-As always, you can register the post-processors as individual bean definitions, but they
-can also be implicitly registered by including the following tag in an XML-based Spring
-configuration (notice the inclusion of the `context` namespace):
+Technically, you can register the post-processors as individual bean definitions, but they
+are implicitly registered in an `AnnotationConfigApplicationContext` already.
+
+In an XML-based Spring setup, you may include the following configuration tag to enable
+mixing and matching with annotation-based configuration:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
 ----

framework-docs/modules/ROOT/pages/core/beans/annotation-config/autowired-qualifiers.adoc

@@ -153,15 +153,15 @@ Letting qualifier values select against target bean names, within the type-match
 candidates, does not require a `@Qualifier` annotation at the injection point.
 If there is no other resolution indicator (such as a qualifier or a primary marker),
 for a non-unique dependency situation, Spring matches the injection point name
-(that is, the field name or parameter name) against the target bean names and chooses the
-same-named candidate, if any.
+(that is, the field name or parameter name) against the target bean names and chooses
+the same-named candidate, if any (either by bean name or by associated alias).
+
+Since version 6.1, this requires the `-parameters` Java compiler flag to be present.
 ====
 
-That said, if you intend to express annotation-driven injection by name, do not
-primarily use `@Autowired`, even if it is capable of selecting by bean name among
-type-matching candidates. Instead, use the JSR-250 `@Resource` annotation, which is
-semantically defined to identify a specific target component by its unique name, with
-the declared type being irrelevant for the matching process. `@Autowired` has rather
+As an alternative for injection by name, consider the JSR-250 `@Resource` annotation
+which is semantically defined to identify a specific target component by its unique name,
+with the declared type being irrelevant for the matching process. `@Autowired` has rather
 different semantics: After selecting candidate beans by type, the specified `String`
 qualifier value is considered within those type-selected candidates only (for example,
 matching an `account` qualifier against beans marked with the same qualifier label).

framework-docs/modules/ROOT/pages/core/beans/annotation-config/autowired.adoc

@@ -186,6 +186,15 @@ implementation type, consider declaring the most specific return type on your fa
 method (at least as specific as required by the injection points referring to your bean).
 ====
 
+[NOTE]
+====
+As of 4.3, `@Autowired` also considers self references for injection (that is, references
+back to the bean that is currently injected). Note that self injection is a fallback.
+In practice, you should use self references as a last resort only (for example, for
+calling other methods on the same instance through the bean's transactional proxy).
+Consider factoring out the affected methods to a separate delegate bean in such a scenario.
+====
+
 You can also instruct Spring to provide all beans of a particular type from the
 `ApplicationContext` by adding the `@Autowired` annotation to a field or method that
 expects an array of that type, as the following example shows:
@@ -268,6 +277,12 @@ use the same bean class). `@Order` values may influence priorities at injection
 but be aware that they do not influence singleton startup order, which is an
 orthogonal concern determined by dependency relationships and `@DependsOn` declarations.
 
+Note that `@Order` annotations on configuration classes just influence the evaluation
+order within the overall set of configuration classes on startup. Such configuration-level
+order values do not affect the contained `@Bean` methods at all. For bean-level ordering,
+each `@Bean` method needs to have its own `@Order` annotation which applies within a
+set of multiple matches for the specific bean type (as returned by the factory method).
+
 Note that the standard `jakarta.annotation.Priority` annotation is not available at the
 `@Bean` level, since it cannot be declared on methods. Its semantics can be modeled
 through `@Order` values in combination with `@Primary` on a single bean for each type.

framework-docs/modules/ROOT/pages/core/beans/basics.adoc

@@ -2,36 +2,28 @@
 = Container Overview
 
 The `org.springframework.context.ApplicationContext` interface represents the Spring IoC
-container and is responsible for instantiating, configuring, and assembling the
-beans. The container gets its instructions on what objects to
-instantiate, configure, and assemble by reading configuration metadata. The
-configuration metadata is represented in XML, Java annotations, or Java code. It lets
-you express the objects that compose your application and the rich interdependencies
-between those objects.
+container and is responsible for instantiating, configuring, and assembling the beans.
+The container gets its instructions on the components to instantiate, configure, and
+assemble by reading configuration metadata. The configuration metadata can be represented
+as annotated component classes, configuration classes with factory methods, or external
+XML files or Groovy scripts. With either format, you may compose your application and the
+rich interdependencies between those components.
 
-Several implementations of the `ApplicationContext` interface are supplied
-with Spring. In stand-alone applications, it is common to create an
-instance of
-{spring-framework-api}/context/support/ClassPathXmlApplicationContext.html[`ClassPathXmlApplicationContext`]
-or {spring-framework-api}/context/support/FileSystemXmlApplicationContext.html[`FileSystemXmlApplicationContext`].
-While XML has been the traditional format for defining configuration metadata, you can
-instruct the container to use Java annotations or code as the metadata format by
-providing a small amount of XML configuration to declaratively enable support for these
-additional metadata formats.
+Several implementations of the `ApplicationContext` interface are part of core Spring.
+In stand-alone applications, it is common to create an instance of
+{spring-framework-api}/context/annotation/AnnotationConfigApplicationContext.html[`AnnotationConfigApplicationContext`]
+or {spring-framework-api}/context/support/ClassPathXmlApplicationContext.html[`ClassPathXmlApplicationContext`].
 
 In most application scenarios, explicit user code is not required to instantiate one or
-more instances of a Spring IoC container. For example, in a web application scenario, a
-simple eight (or so) lines of boilerplate web descriptor XML in the `web.xml` file
-of the application typically suffices (see
+more instances of a Spring IoC container. For example, in a plain web application scenario,
+a simple boilerplate web descriptor XML in the `web.xml` file of the application suffices (see
 xref:core/beans/context-introduction.adoc#context-create[Convenient ApplicationContext Instantiation for Web Applications]).
-If you use the {spring-site-tools}[Spring Tools for Eclipse] (an Eclipse-powered
-development environment), you can easily create this boilerplate configuration with a
-few mouse clicks or keystrokes.
+In a Spring Boot scenario, the application context is implicitly bootstrapped for you
+based on common setup conventions.
 
 The following diagram shows a high-level view of how Spring works. Your application classes
 are combined with configuration metadata so that, after the `ApplicationContext` is
-created and initialized, you have a fully configured and executable system or
-application.
+created and initialized, you have a fully configured and executable system or application.
 
 .The Spring IoC container
 image::container-magic.png[]
@@ -43,33 +35,25 @@ image::container-magic.png[]
 
 As the preceding diagram shows, the Spring IoC container consumes a form of
 configuration metadata. This configuration metadata represents how you, as an
-application developer, tell the Spring container to instantiate, configure, and assemble
-the objects in your application.
+application developer, tell the Spring container to instantiate, configure,
+and assemble the components in your application.
 
-Configuration metadata is traditionally supplied in a simple and intuitive XML format,
-which is what most of this chapter uses to convey key concepts and features of the
-Spring IoC container.
-
-NOTE: XML-based metadata is not the only allowed form of configuration metadata.
 The Spring IoC container itself is totally decoupled from the format in which this
 configuration metadata is actually written. These days, many developers choose
-xref:core/beans/java.adoc[Java-based configuration] for their Spring applications.
-
-For information about using other forms of metadata with the Spring container, see:
+xref:core/beans/java.adoc[Java-based configuration] for their Spring applications:
 
 * xref:core/beans/annotation-config.adoc[Annotation-based configuration]: define beans using
-  annotation-based configuration metadata.
+  annotation-based configuration metadata on your application's component classes.
 * xref:core/beans/java.adoc[Java-based configuration]: define beans external to your application
-  classes by using Java rather than XML files. To use these features, see the
+  classes by using Java-based configuration classes. To use these features, see the
   {spring-framework-api}/context/annotation/Configuration.html[`@Configuration`],
   {spring-framework-api}/context/annotation/Bean.html[`@Bean`],
   {spring-framework-api}/context/annotation/Import.html[`@Import`],
   and {spring-framework-api}/context/annotation/DependsOn.html[`@DependsOn`] annotations.
 
-Spring configuration consists of at least one and typically more than one bean
-definition that the container must manage. XML-based configuration metadata configures these
-beans as `<bean/>` elements inside a top-level `<beans/>` element. Java
-configuration typically uses `@Bean`-annotated methods within a `@Configuration` class.
+Spring configuration consists of at least one and typically more than one bean definition
+that the container must manage. Java configuration typically uses `@Bean`-annotated
+methods within a `@Configuration` class, each corresponding to one bean definition.
 
 These bean definitions correspond to the actual objects that make up your application.
 Typically, you define service layer objects, persistence layer objects such as
@@ -79,7 +63,14 @@ Typically, one does not configure fine-grained domain objects in the container,
 it is usually the responsibility of repositories and business logic to create and load
 domain objects.
 
-The following example shows the basic structure of XML-based configuration metadata:
+
+
+[[beans-factory-xml]]
+=== XML as an External Configuration DSL
+
+XML-based configuration metadata configures these beans as `<bean/>` elements inside
+a top-level `<beans/>` element. The following example shows the basic structure of
+XML-based configuration metadata:
 
 [source,xml,indent=0,subs="verbatim,quotes"]
 ----
@@ -110,14 +101,9 @@ The value of the `id` attribute can be used to refer to collaborating objects. T
 for referring to collaborating objects is not shown in this example. See
 xref:core/beans/dependencies.adoc[Dependencies] for more information.
 
-
-
-[[beans-factory-instantiation]]
-== Instantiating a Container
-
-The location path or paths
-supplied to an `ApplicationContext` constructor are resource strings that let
-the container load configuration metadata from a variety of external resources, such
+For instantiating a container, the location path or paths to the XML resource files
+need to be supplied to a `ClassPathXmlApplicationContext` constructor that let the
+container load configuration metadata from a variety of external resources, such
 as the local file system, the Java `CLASSPATH`, and so on.
 
 [tabs]
@@ -141,7 +127,7 @@ Kotlin::
 ====
 After you learn about Spring's IoC container, you may want to know more about Spring's
 `Resource` abstraction (as described in
-xref:web/webflux-webclient/client-builder.adoc#webflux-client-builder-reactor-resources[Resources])
+xref:core/resources.adoc[Resources])
 which provides a convenient mechanism for reading an InputStream from locations defined
 in a URI syntax. In particular, `Resource` paths are used to construct applications contexts,
 as described in xref:core/resources.adoc#resources-app-ctx[Application Contexts and Resource Paths].
@@ -209,9 +195,9 @@ xref:core/beans/dependencies.adoc[Dependencies].
 It can be useful to have bean definitions span multiple XML files. Often, each individual
 XML configuration file represents a logical layer or module in your architecture.
 
-You can use the application context constructor to load bean definitions from all these
+You can use the `ClassPathXmlApplicationContext` constructor to load bean definitions from
 XML fragments. This constructor takes multiple `Resource` locations, as was shown in the
-xref:core/beans/basics.adoc#beans-factory-instantiation[previous section]. Alternatively,
+xref:core/beans/basics.adoc#beans-factory-xml[previous section]. Alternatively,
 use one or more occurrences of the `<import/>` element to load bean definitions from
 another file or files. The following example shows how to do so:
 
@@ -259,7 +245,7 @@ configuration features beyond plain bean definitions are available in a selectio
 of XML namespaces provided by Spring -- for example, the `context` and `util` namespaces.
 
 
-[[groovy-bean-definition-dsl]]
+[[beans-factory-groovy]]
 === The Groovy Bean Definition DSL
 
 As a further example for externalized configuration metadata, bean definitions can also
@@ -420,4 +406,3 @@ a dependency on a specific bean through metadata (such as an autowiring annotati
 
 
 
-

framework-docs/modules/ROOT/pages/core/beans/definition.adoc

@@ -75,6 +75,31 @@ lead to concurrent access exceptions, inconsistent state in the bean container,
 
 
 
+[[beans-definition-overriding]]
+== Overriding Beans
+
+Bean overriding is happening when a bean is registered using an identifier that is
+already allocated. While bean overriding is possible, it makes the configuration harder
+to read and this feature will be deprecated in a future release.
+
+To disable bean overriding altogether, you can set the `allowBeanDefinitionOverriding`
+flag to `false` on the `ApplicationContext` before it is refreshed. In such setup, an
+exception is thrown if bean overriding is used.
+
+By default, the container logs every bean overriding at `INFO` level so that you can
+adapt your configuration accordingly. While not recommended, you can silence those logs
+by setting the `allowBeanDefinitionOverriding` flag to `true`.
+
+.Java-configuration
+****
+If you use Java Configuration, a corresponding `@Bean` method always silently overrides
+a scanned bean class with the same component name as long as the return type of the
+`@Bean` method matches that bean class. This simply means that the container will call
+the `@Bean` factory method in favor of any pre-declared constructor on the bean class.
+****
+
+
+
 [[beans-beanname]]
 == Naming Beans
 
@@ -234,6 +259,10 @@ For details about the mechanism for supplying arguments to the constructor (if r
 and setting object instance properties after the object is constructed, see
 xref:core/beans/dependencies/factory-collaborators.adoc[Injecting Dependencies].
 
+NOTE: In the case of constructor arguments, the container can select a corresponding
+constructor among several overloaded constructors. That said, to avoid ambiguities,
+it is recommended to keep your constructor signatures as straightforward as possible.
+
 
 [[beans-factory-class-static-factory-method]]
 === Instantiation with a Static Factory Method
@@ -294,6 +323,24 @@ For details about the mechanism for supplying (optional) arguments to the factor
 and setting object instance properties after the object is returned from the factory,
 see xref:core/beans/dependencies/factory-properties-detailed.adoc[Dependencies and Configuration in Detail].
 
+NOTE: In the case of factory method arguments, the container can select a corresponding
+method among several overloaded methods of the same name. That said, to avoid ambiguities,
+it is recommended to keep your factory method signatures as straightforward as possible.
+
+[TIP]
+====
+A typical problematic case with factory method overloading is Mockito with its many
+overloads of the `mock` method. Choose the most specific variant of `mock` possible:
+
+[source,xml,indent=0,subs="verbatim,quotes"]
+----
+	<bean id="clientService" class="org.mockito.Mockito" factory-method="mock">
+		<constructor-arg type="java.lang.Class" value="examples.ClientService"/>
+		<constructor-arg type="java.lang.String" value="clientService"/>
+	</bean>
+----
+====
+
 
 [[beans-factory-class-instance-factory-method]]
 === Instantiation by Using an Instance Factory Method
@@ -416,8 +463,8 @@ Kotlin::
 ======
 
 This approach shows that the factory bean itself can be managed and configured through
-dependency injection (DI). See xref:core/beans/dependencies/factory-properties-detailed.adoc[Dependencies and Configuration in Detail]
-.
+dependency injection (DI).
+See xref:core/beans/dependencies/factory-properties-detailed.adoc[Dependencies and Configuration in Detail].
 
 NOTE: In Spring documentation, "factory bean" refers to a bean that is configured in the
 Spring container and that creates objects through an
@@ -444,5 +491,3 @@ cases into account and returns the type of object that a `BeanFactory.getBean` c
 going to return for the same bean name.
 
 
-
-

framework-docs/modules/ROOT/pages/core/beans/factory-extension.adoc

@@ -439,7 +439,7 @@ dataSource.url=jdbc:mysql:mydb
 ----
 
 This example file can be used with a container definition that contains a bean called
-`dataSource` that has `driver` and `url` properties.
+`dataSource` that has `driverClassName` and `url` properties.
 
 Compound property names are also supported, as long as every component of the path
 except the final property being overridden is already non-null (presumably initialized

framework-docs/modules/ROOT/pages/core/beans/factory-nature.adoc

@@ -592,6 +592,40 @@ Kotlin::
 
 
 
+[[beans-factory-thread-safety]]
+=== Thread Safety and Visibility
+
+The Spring core container publishes created singleton instances in a thread-safe manner,
+guarding access through a singleton lock and guaranteeing visibility in other threads.
+
+As a consequence, application-provided bean classes do not have to be concerned about the
+visibility of their initialization state. Regular configuration fields do not have to be
+marked as `volatile` as long as they are only mutated during the initialization phase,
+providing visibility guarantees similar to `final` even for setter-based configuration
+state that is mutable during that initial phase. If such fields get changed after the
+bean creation phase and its subsequent initial publication, they need to be declared as
+`volatile` or guarded by a common lock whenever accessed.
+
+Note that concurrent access to such configuration state in singleton bean instances,
+e.g. for controller instances or repository instances, is perfectly thread-safe after
+such safe initial publication from the container side. This includes common singleton
+`FactoryBean` instances which are processed within the general singleton lock as well.
+
+For destruction callbacks, the configuration state remains thread-safe but any runtime
+state accumulated between initialization and destruction should be kept in thread-safe
+structures (or in `volatile` fields for simple cases) as per common Java guidelines.
+
+Deeper `Lifecycle` integration as shown above involves runtime-mutable state such as
+a `runnable` field which will have to be declared as `volatile`. While the common
+lifecycle callbacks follow a certain order, e.g. a start callback is guaranteed to
+only happen after full initialization and a stop callback only after an initial start,
+there is a special case with the common stop before destroy arrangement: It is strongly
+recommended that the internal state in any such bean also allows for an immediate
+destroy callback without a preceding stop since this may happen during an extraordinary
+shutdown after a cancelled bootstrap or in case of a stop timeout caused by another bean.
+
+
+
 [[beans-factory-aware]]
 == `ApplicationContextAware` and `BeanNameAware`
 

framework-docs/modules/ROOT/pages/core/beans/factory-scopes.adoc

@@ -324,7 +324,6 @@ Kotlin::
 
 
 
-
 [[beans-factory-scopes-application]]
 === Application Scope
 
@@ -374,7 +373,6 @@ Kotlin::
 
 
 
-
 [[beans-factory-scopes-websocket]]
 === WebSocket Scope
 
@@ -384,7 +382,6 @@ xref:web/websocket/stomp/scope.adoc[WebSocket scope] for more details.
 
 
 
-
 [[beans-factory-scopes-other-injection]]
 === Scoped Beans as Dependencies
 
@@ -544,6 +541,19 @@ see xref:core/aop/proxying.adoc[Proxying Mechanisms].
 
 
 
+[[beans-factory-scopes-injection]]
+=== Injecting Request/Session References Directly
+
+As an alternative to factory scopes, a Spring `WebApplicationContext` also supports
+the injection of `HttpServletRequest`, `HttpServletResponse`, `HttpSession`,
+`WebRequest` and (if JSF is present) `FacesContext` and `ExternalContext` into
+Spring-managed beans, simply through type-based autowiring next to regular injection
+points for other beans. Spring generally injects proxies for such request and session
+objects which has the advantage of working in singleton beans and serializable beans
+as well, similar to scoped proxies for factory-scoped beans.
+
+
+
 [[beans-factory-scopes-custom]]
 == Custom Scopes
 

framework-docs/modules/ROOT/pages/core/beans/java/basic-concepts.adoc

@@ -55,33 +55,34 @@ The preceding `AppConfig` class is equivalent to the following Spring `<beans/>`
 	</beans>
 ----
 
-.Full @Configuration vs "`lite`" @Bean mode?
+.@Configuration classes with or without local calls between @Bean methods?
 ****
-When `@Bean` methods are declared within classes that are not annotated with
-`@Configuration`, they are referred to as being processed in a "`lite`" mode. Bean methods
-declared on a bean that is not annotated with `@Configuration` are considered to be "`lite`",
-with a different primary purpose of the containing class and a `@Bean` method
-being a sort of bonus there. For example, service components may expose management views
-to the container through an additional `@Bean` method on each applicable component class.
-In such scenarios, `@Bean` methods are a general-purpose factory method mechanism.
-
-Unlike full `@Configuration`, lite `@Bean` methods cannot declare inter-bean dependencies.
-Instead, they operate on their containing component's internal state and, optionally, on
-arguments that they may declare. Such a `@Bean` method should therefore not invoke other
-`@Bean` methods. Each such method is literally only a factory method for a particular
-bean reference, without any special runtime semantics. The positive side-effect here is
-that no CGLIB subclassing has to be applied at runtime, so there are no limitations in
-terms of class design (that is, the containing class may be `final` and so forth).
-
 In common scenarios, `@Bean` methods are to be declared within `@Configuration` classes,
-ensuring that "`full`" mode is always used and that cross-method references therefore
-get redirected to the container's lifecycle management. This prevents the same
-`@Bean` method from accidentally being invoked through a regular Java call, which helps
-to reduce subtle bugs that can be hard to track down when operating in "`lite`" mode.
+ensuring that full configuration class processing applies and that cross-method
+references therefore get redirected to the container's lifecycle management.
+This prevents the same `@Bean` method from accidentally being invoked through a regular
+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 -,
+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).
+A custom Java call to such a method will not get intercepted by the container and
+therefore behaves just like a regular method call, creating a new instance every time
+rather than reusing an existing singleton (or scoped) instance for the given bean.
+
+As a consequence, `@Bean` methods on classes without runtime proxying are not meant to
+declare inter-bean dependencies at all. Instead, they are expected to operate on their
+containing component's fields and, optionally, on arguments that a factory method may
+declare in order to receive autowired collaborators. Such a `@Bean` method therefore
+never needs to invoke other `@Bean` methods; every such call can be expressed through
+a factory method argument instead. The positive side-effect here is that no CGLIB
+subclassing has to be applied at runtime, reducing the overhead and the footprint.
 ****
 
 The `@Bean` and `@Configuration` annotations are discussed in depth in the following sections.
-First, however, we cover the various ways of creating a spring container by using
+First, however, we cover the various ways of creating a Spring container by using
 Java-based configuration.
 
 

framework-docs/modules/ROOT/pages/core/expressions.adoc

@@ -1,10 +1,11 @@
 [[expressions]]
 = Spring Expression Language (SpEL)
 
-The Spring Expression Language ("`SpEL`" for short) is a powerful expression language that
+The Spring Expression Language ("SpEL" for short) is a powerful expression language that
 supports querying and manipulating an object graph at runtime. The language syntax is
-similar to Unified EL but offers additional features, most notably method invocation and
-basic string templating functionality.
+similar to the https://jakarta.ee/specifications/expression-language/[Jakarta Expression
+Language] but offers additional features, most notably method invocation and basic string
+templating functionality.
 
 While there are several other Java expression languages available -- OGNL, MVEL, and JBoss
 EL, to name a few -- the Spring Expression Language was created to provide the Spring
@@ -33,26 +34,24 @@ populate them are listed at the end of the chapter.
 The expression language supports the following functionality:
 
 * Literal expressions
-* Boolean and relational operators
-* Regular expressions
-* Class expressions
 * Accessing properties, arrays, lists, and maps
-* Method invocation
-* Assignment
-* Calling constructors
-* Bean references
-* Array construction
 * Inline lists
 * Inline maps
-* Ternary operator
+* Array construction
+* Relational operators
+* Regular expressions
+* Logical operators
+* String operators
+* Mathematical operators
+* Assignment
+* Type expressions
+* Method invocation
+* Constructor invocation
 * Variables
-* User-defined functions added to the context
-  * reflective invocation of `Method`
-  * various cases of `MethodHandle`
+* User-defined functions
+* Bean references
+* Ternary, Elvis, and safe-navigation operators
 * Collection projection
 * Collection selection
 * Templated expressions
 
-
-
-

framework-docs/modules/ROOT/pages/core/expressions/evaluation.adoc

@@ -1,12 +1,12 @@
 [[expressions-evaluation]]
 = Evaluation
 
-This section introduces the simple use of SpEL interfaces and its expression language.
-The complete language reference can be found in
+This section introduces programmatic use of SpEL's interfaces and its expression language.
+The complete language reference can be found in the
 xref:core/expressions/language-ref.adoc[Language Reference].
 
-The following code introduces the SpEL API to evaluate the literal string expression,
-`Hello World`.
+The following code demonstrates how to use the SpEL API to evaluate the literal string
+expression, `Hello World`.
 
 [tabs]
 ======
@@ -18,7 +18,7 @@ Java::
 	Expression exp = parser.parseExpression("'Hello World'"); // <1>
 	String message = (String) exp.getValue();
 ----
-<1> The value of the message variable is `'Hello World'`.
+<1> The value of the message variable is `"Hello World"`.
 
 Kotlin::
 +
@@ -28,24 +28,24 @@ Kotlin::
 	val exp = parser.parseExpression("'Hello World'") // <1>
 	val message = exp.value as String
 ----
-<1> The value of the message variable is `'Hello World'`.
+<1> The value of the message variable is `"Hello World"`.
 ======
 
-
 The SpEL classes and interfaces you are most likely to use are located in the
 `org.springframework.expression` package and its sub-packages, such as `spel.support`.
 
-The `ExpressionParser` interface is responsible for parsing an expression string. In
-the preceding example, the expression string is a string literal denoted by the surrounding single
-quotation marks. The `Expression` interface is responsible for evaluating the previously defined
-expression string. Two exceptions that can be thrown, `ParseException` and
-`EvaluationException`, when calling `parser.parseExpression` and `exp.getValue`,
-respectively.
+The `ExpressionParser` interface is responsible for parsing an expression string. In the
+preceding example, the expression string is a string literal denoted by the surrounding
+single quotation marks. The `Expression` interface is responsible for evaluating the
+defined expression string. The two types of exceptions that can be thrown when calling
+`parser.parseExpression(...)` and `exp.getValue(...)` are `ParseException` and
+`EvaluationException`, respectively.
 
-SpEL supports a wide range of features, such as calling methods, accessing properties,
+SpEL supports a wide range of features such as calling methods, accessing properties,
 and calling constructors.
 
-In the following example of method invocation, we call the `concat` method on the string literal:
+In the following method invocation example, we call the `concat` method on the string
+literal, `Hello World`.
 
 [tabs]
 ======
@@ -57,7 +57,7 @@ Java::
 	Expression exp = parser.parseExpression("'Hello World'.concat('!')"); // <1>
 	String message = (String) exp.getValue();
 ----
-<1> The value of `message` is now 'Hello World!'.
+<1> The value of `message` is now `"Hello World!"`.
 
 Kotlin::
 +
@@ -67,10 +67,11 @@ Kotlin::
 	val exp = parser.parseExpression("'Hello World'.concat('!')") // <1>
 	val message = exp.value as String
 ----
-<1> The value of `message` is now 'Hello World!'.
+<1> The value of `message` is now `"Hello World!"`.
 ======
 
-The following example of calling a JavaBean property calls the `String` property `Bytes`:
+The following example demonstrates how to access the `Bytes` JavaBean property of the
+string literal, `Hello World`.
 
 [tabs]
 ======
@@ -100,10 +101,10 @@ Kotlin::
 ======
 
 SpEL also supports nested properties by using the standard dot notation (such as
-`prop1.prop2.prop3`) and also the corresponding setting of property values.
+`prop1.prop2.prop3`) as well as the corresponding setting of property values.
 Public fields may also be accessed.
 
-The following example shows how to use dot notation to get the length of a literal:
+The following example shows how to use dot notation to get the length of a string literal.
 
 [tabs]
 ======
@@ -133,7 +134,7 @@ Kotlin::
 ======
 
 The String's constructor can be called instead of using a string literal, as the following
-example shows:
+example shows.
 
 [tabs]
 ======
@@ -145,7 +146,7 @@ Java::
 	Expression exp = parser.parseExpression("new String('hello world').toUpperCase()"); // <1>
 	String message = exp.getValue(String.class);
 ----
-<1> Construct a new `String` from the literal and make it be upper case.
+<1> Construct a new `String` from the literal and convert it to upper case.
 
 Kotlin::
 +
@@ -155,10 +156,9 @@ Kotlin::
 	val exp = parser.parseExpression("new String('hello world').toUpperCase()")  // <1>
 	val message = exp.getValue(String::class.java)
 ----
-<1> Construct a new `String` from the literal and make it be upper case.
+<1> Construct a new `String` from the literal and convert it to upper case.
 ======
 
-
 Note the use of the generic method: `public <T> T getValue(Class<T> desiredResultType)`.
 Using this method removes the need to cast the value of the expression to the desired
 result type. An `EvaluationException` is thrown if the value cannot be cast to the
@@ -166,8 +166,8 @@ type `T` or converted by using the registered type converter.
 
 The more common usage of SpEL is to provide an expression string that is evaluated
 against a specific object instance (called the root object). The following example shows
-how to retrieve the `name` property from an instance of the `Inventor` class or
-create a boolean condition:
+how to retrieve the `name` property from an instance of the `Inventor` class and how to
+reference the `name` property in a boolean expression.
 
 [tabs]
 ======
@@ -240,7 +240,7 @@ It excludes Java type references, constructors, and bean references. It also req
 you to explicitly choose the level of support for properties and methods in expressions.
 By default, the `create()` static factory method enables only read access to properties.
 You can also obtain a builder to configure the exact level of support needed, targeting
-one or some combination of the following:
+one or some combination of the following.
 
 * Custom `PropertyAccessor` only (no reflection)
 * Data binding properties for read-only access
@@ -252,16 +252,15 @@ one or some combination of the following:
 
 By default, SpEL uses the conversion service available in Spring core
 (`org.springframework.core.convert.ConversionService`). This conversion service comes
-with many built-in converters for common conversions but is also fully extensible so that
-you can add custom conversions between types. Additionally, it is
-generics-aware. This means that, when you work with generic types in
-expressions, SpEL attempts conversions to maintain type correctness for any objects
-it encounters.
+with many built-in converters for common conversions, but is also fully extensible so
+that you can add custom conversions between types. Additionally, it is generics-aware.
+This means that, when you work with generic types in expressions, SpEL attempts
+conversions to maintain type correctness for any objects it encounters.
 
 What does this mean in practice? Suppose assignment, using `setValue()`, is being used
 to set a `List` property. The type of the property is actually `List<Boolean>`. SpEL
 recognizes that the elements of the list need to be converted to `Boolean` before
-being placed in it. The following example shows how to do so:
+being placed in it. The following example shows how to do so.
 
 [tabs]
 ======
@@ -325,7 +324,7 @@ constructor before setting the specified value. If the element type does not hav
 default constructor, `null` will be added to the array or list. If there is no built-in
 or custom converter that knows how to set the value, `null` will remain in the array or
 list at the specified index. The following example demonstrates how to automatically grow
-the list:
+the list.
 
 [tabs]
 ======
@@ -380,16 +379,25 @@ Kotlin::
 ----
 ======
 
+By default, a SpEL expression cannot contain more than 10,000 characters; however, the
+`maxExpressionLength` is configurable. If you create a `SpelExpressionParser`
+programmatically, you can specify a custom `maxExpressionLength` when creating the
+`SpelParserConfiguration` that you provide to the `SpelExpressionParser`. If you wish to
+set the `maxExpressionLength` used for parsing SpEL expressions within an
+`ApplicationContext` -- for example, in XML bean definitions, `@Value`, etc. -- you can
+set a JVM system property or Spring property named `spring.context.expression.maxLength`
+to the maximum expression length needed by your application (see
+xref:appendix.adoc#appendix-spring-properties[Supported Spring Properties]).
 
 
 [[expressions-spel-compilation]]
 == SpEL Compilation
 
-Spring Framework 4.1 includes a basic expression compiler. Expressions are usually
-interpreted, which provides a lot of dynamic flexibility during evaluation but
-does not provide optimum performance. For occasional expression usage,
-this is fine, but, when used by other components such as Spring Integration,
-performance can be very important, and there is no real need for the dynamism.
+Spring provides a basic compiler for SpEL expressions. Expressions are usually
+interpreted, which provides a lot of dynamic flexibility during evaluation but does not
+provide optimum performance. For occasional expression usage, this is fine, but, when
+used by other components such as Spring Integration, performance can be very important,
+and there is no real need for the dynamism.
 
 The SpEL compiler is intended to address this need. During evaluation, the compiler
 generates a Java class that embodies the expression behavior at runtime and uses that
@@ -402,16 +410,17 @@ information can cause trouble later if the types of the various expression eleme
 change over time. For this reason, compilation is best suited to expressions whose
 type information is not going to change on repeated evaluations.
 
-Consider the following basic expression:
+Consider the following basic expression.
 
+[source,java,indent=0,subs="verbatim,quotes"]
 ----
-someArray[0].someProperty.someOtherProperty < 0.1
+	someArray[0].someProperty.someOtherProperty < 0.1
 ----
 
-Because the preceding expression involves array access, some property de-referencing,
-and numeric operations, the performance gain can be very noticeable. In an example
-micro benchmark run of 50000 iterations, it took 75ms to evaluate by using the
-interpreter and only 3ms using the compiled version of the expression.
+Because the preceding expression involves array access, some property de-referencing, and
+numeric operations, the performance gain can be very noticeable. In an example micro
+benchmark run of 50,000 iterations, it took 75ms to evaluate by using the interpreter and
+only 3ms using the compiled version of the expression.
 
 
 [[expressions-compiler-configuration]]
@@ -419,33 +428,34 @@ interpreter and only 3ms using the compiled version of the expression.
 
 The compiler is not turned on by default, but you can turn it on in either of two
 different ways. You can turn it on by using the parser configuration process
-(xref:core/expressions/evaluation.adoc#expressions-parser-configuration[discussed earlier]) or by using a Spring property
-when SpEL usage is embedded inside another component. This section discusses both of
-these options.
+(xref:core/expressions/evaluation.adoc#expressions-parser-configuration[discussed
+earlier]) or by using a Spring property when SpEL usage is embedded inside another
+component. This section discusses both of these options.
 
 The compiler can operate in one of three modes, which are captured in the
-`org.springframework.expression.spel.SpelCompilerMode` enum. The modes are as follows:
+`org.springframework.expression.spel.SpelCompilerMode` enum. The modes are as follows.
 
 * `OFF` (default): The compiler is switched off.
 * `IMMEDIATE`: In immediate mode, the expressions are compiled as soon as possible. This
-is typically after the first interpreted evaluation. If the compiled expression fails
-(typically due to a type changing, as described earlier), the caller of the expression
-evaluation receives an exception.
-* `MIXED`: In mixed mode, the expressions silently switch between interpreted and compiled
-mode over time. After some number of interpreted runs, they switch to compiled
-form and, if something goes wrong with the compiled form (such as a type changing, as
-described earlier), the expression automatically switches back to interpreted form
-again. Sometime later, it may generate another compiled form and switch to it. Basically,
-the exception that the user gets in `IMMEDIATE` mode is instead handled internally.
+  is typically after the first interpreted evaluation. If the compiled expression fails
+  (typically due to a type changing, as described earlier), the caller of the expression
+  evaluation receives an exception.
+* `MIXED`: In mixed mode, the expressions silently switch between interpreted and
+  compiled mode over time. After some number of interpreted runs, they switch to compiled
+  form and, if something goes wrong with the compiled form (such as a type changing, as
+  described earlier), the expression automatically switches back to interpreted form
+  again. Sometime later, it may generate another compiled form and switch to it.
+  Basically, the exception that the user gets in `IMMEDIATE` mode is instead handled
+  internally.
 
 `IMMEDIATE` mode exists because `MIXED` mode could cause issues for expressions that
 have side effects. If a compiled expression blows up after partially succeeding, it
 may have already done something that has affected the state of the system. If this
 has happened, the caller may not want it to silently re-run in interpreted mode,
-since part of the expression may be running twice.
+since part of the expression may be run twice.
 
 After selecting a mode, use the `SpelParserConfiguration` to configure the parser. The
-following example shows how to do so:
+following example shows how to do so.
 
 [tabs]
 ======
@@ -482,15 +492,16 @@ Kotlin::
 ----
 ======
 
-When you specify the compiler mode, you can also specify a classloader (passing null is allowed).
-Compiled expressions are defined in a child classloader created under any that is supplied.
-It is important to ensure that, if a classloader is specified, it can see all the types involved in
-the expression evaluation process. If you do not specify a classloader, a default classloader is used
-(typically the context classloader for the thread that is running during expression evaluation).
+When you specify the compiler mode, you can also specify a `ClassLoader` (passing `null`
+is allowed). Compiled expressions are defined in a child `ClassLoader` created under any
+that is supplied. It is important to ensure that, if a `ClassLoader` is specified, it can
+see all the types involved in the expression evaluation process. If you do not specify a
+`ClassLoader`, a default `ClassLoader` is used (typically the context `ClassLoader` for
+the thread that is running during expression evaluation).
 
 The second way to configure the compiler is for use when SpEL is embedded inside some
 other component and it may not be possible to configure it through a configuration
-object. In these cases, it is possible to set the `spring.expression.compiler.mode`
+object. In such cases, it is possible to set the `spring.expression.compiler.mode`
 property via a JVM system property (or via the
 xref:appendix.adoc#appendix-spring-properties[`SpringProperties`] mechanism) to one of the
 `SpelCompilerMode` enum values (`off`, `immediate`, or `mixed`).
@@ -499,18 +510,16 @@ xref:appendix.adoc#appendix-spring-properties[`SpringProperties`] mechanism) to
 [[expressions-compiler-limitations]]
 === Compiler Limitations
 
-Since Spring Framework 4.1, the basic compilation framework is in place. However, the framework
-does not yet support compiling every kind of expression. The initial focus has been on the
-common expressions that are likely to be used in performance-critical contexts. The following
-kinds of expression cannot be compiled at the moment:
+Spring does not support compiling every kind of expression. The primary focus is on
+common expressions that are likely to be used in performance-critical contexts. The
+following kinds of expressions cannot be compiled.
 
 * Expressions involving assignment
 * Expressions relying on the conversion service
 * Expressions using custom resolvers or accessors
+* Expressions using overloaded operators
+* Expressions using array construction syntax
 * Expressions using selection or projection
 
-More types of expressions will be compilable in the future.
-
-
-
+Compilation of additional kinds of expressions may be supported in the future.
 

framework-docs/modules/ROOT/pages/core/expressions/example-classes.adoc

@@ -3,9 +3,11 @@
 
 This section lists the classes used in the examples throughout this chapter.
 
+== `Inventor`
+
 [tabs]
 ======
-Inventor.Java::
+Java::
 +
 [source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
 ----
@@ -80,7 +82,7 @@ Inventor.Java::
 	}
 ----
 
-Inventor.kt::
+Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
 ----
@@ -95,9 +97,11 @@ Inventor.kt::
 ----
 ======
 
+== `PlaceOfBirth`
+
 [tabs]
 ======
-PlaceOfBirth.java::
+Java::
 +
 [source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
 ----
@@ -135,7 +139,7 @@ PlaceOfBirth.java::
 	}
 ----
 
-PlaceOfBirth.kt::
+Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
 ----
@@ -145,9 +149,11 @@ PlaceOfBirth.kt::
 ----
 ======
 
+== `Society`
+
 [tabs]
 ======
-Society.java::
+Java::
 +
 [source,java,indent=0,subs="verbatim,quotes",role="primary",chomp="-packages"]
 ----
@@ -192,7 +198,7 @@ Society.java::
 	}
 ----
 
-Society.kt::
+Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary",chomp="-packages"]
 ----

framework-docs/modules/ROOT/pages/core/expressions/language-ref/array-construction.adoc

@@ -13,7 +13,7 @@ Java::
 	int[] numbers1 = (int[]) parser.parseExpression("new int[4]").getValue(context);
 
 	// Array with initializer
-	int[] numbers2 = (int[]) parser.parseExpression("new int[]{1,2,3}").getValue(context);
+	int[] numbers2 = (int[]) parser.parseExpression("new int[] {1, 2, 3}").getValue(context);
 
 	// Multi dimensional array
 	int[][] numbers3 = (int[][]) parser.parseExpression("new int[4][5]").getValue(context);
@@ -26,14 +26,22 @@ Kotlin::
 	val numbers1 = parser.parseExpression("new int[4]").getValue(context) as IntArray
 
 	// Array with initializer
-	val numbers2 = parser.parseExpression("new int[]{1,2,3}").getValue(context) as IntArray
+	val numbers2 = parser.parseExpression("new int[] {1, 2, 3}").getValue(context) as IntArray
 
 	// Multi dimensional array
 	val numbers3 = parser.parseExpression("new int[4][5]").getValue(context) as Array<IntArray>
 ----
 ======
 
+[NOTE]
+====
 You cannot currently supply an initializer when you construct a multi-dimensional array.
+====
 
-
-
+[CAUTION]
+====
+Any expression that constructs an array – for example, via `new int[4]` or
+`new int[] {1, 2, 3}` – cannot be compiled. See
+xref:core/expressions/evaluation.adoc#expressions-compiler-limitations[Compiler Limitations]
+for details.
+====

framework-docs/modules/ROOT/pages/core/expressions/language-ref/collection-projection.adoc

@@ -4,7 +4,7 @@
 Projection lets a collection drive the evaluation of a sub-expression, and the result is
 a new collection. The syntax for projection is `.![projectionExpression]`. For example,
 suppose we have a list of inventors but want the list of cities where they were born.
-Effectively, we want to evaluate 'placeOfBirth.city' for every entry in the inventor
+Effectively, we want to evaluate `placeOfBirth.city` for every entry in the inventor
 list. The following example uses projection to do so:
 
 [tabs]
@@ -13,16 +13,18 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 ----
-	// returns ['Smiljan', 'Idvor' ]
-	List placesOfBirth = (List)parser.parseExpression("members.![placeOfBirth.city]");
+	// evaluates to ["Smiljan", "Idvor"]
+	List placesOfBirth = parser.parseExpression("members.![placeOfBirth.city]")
+			.getValue(societyContext, List.class);
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 ----
-	// returns ['Smiljan', 'Idvor' ]
-	val placesOfBirth = parser.parseExpression("members.![placeOfBirth.city]") as List<*>
+	// evaluates to ["Smiljan", "Idvor"]
+	val placesOfBirth = parser.parseExpression("members.![placeOfBirth.city]")
+	 		.getValue(societyContext) as List<*>
 ----
 ======
 
@@ -32,5 +34,12 @@ evaluated against each entry in the map (represented as a Java `Map.Entry`). The
 of a projection across a map is a list that consists of the evaluation of the projection
 expression against each map entry.
 
+[NOTE]
+====
+The Spring Expression Language also supports safe navigation for collection projection.
 
+See
+xref:core/expressions/language-ref/operator-safe-navigation.adoc#expressions-operator-safe-navigation-selection-and-projection[Safe Collection Selection and Projection]
+for details.
+====
 

framework-docs/modules/ROOT/pages/core/expressions/language-ref/collection-selection.adoc

@@ -28,13 +28,14 @@ Kotlin::
 ======
 
 Selection is supported for arrays and anything that implements `java.lang.Iterable` or
-`java.util.Map`. For a list or array, the selection criteria is evaluated against each
-individual element. Against a map, the selection criteria is evaluated against each map
-entry (objects of the Java type `Map.Entry`). Each map entry has its `key` and `value`
-accessible as properties for use in the selection.
+`java.util.Map`. For an array or `Iterable`, the selection expression is evaluated
+against each individual element. Against a map, the selection expression is evaluated
+against each map entry (objects of the Java type `Map.Entry`). Each map entry has its
+`key` and `value` accessible as properties for use in the selection.
 
-The following expression returns a new map that consists of those elements of the
-original map where the entry's value is less than 27:
+Given a `Map` stored in a variable named `#map`, the following expression returns a new
+map that consists of those elements of the original map where the entry's value is less
+than 27:
 
 [tabs]
 ======
@@ -42,21 +43,28 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 ----
-	Map newMap = parser.parseExpression("map.?[value<27]").getValue();
+	Map newMap = parser.parseExpression("#map.?[value < 27]").getValue(Map.class);
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 ----
-	val newMap = parser.parseExpression("map.?[value<27]").getValue()
+	val newMap = parser.parseExpression("#map.?[value < 27]").getValue() as Map
 ----
 ======
 
 In addition to returning all the selected elements, you can retrieve only the first or
-the last element. To obtain the first element matching the selection, the syntax is
-`.^[selectionExpression]`. To obtain the last matching selection, the syntax is
-`.$[selectionExpression]`.
+the last element. To obtain the first element matching the selection expression, the
+syntax is `.^[selectionExpression]`. To obtain the last element matching the selection
+expression, the syntax is `.$[selectionExpression]`.
 
+[NOTE]
+====
+The Spring Expression Language also supports safe navigation for collection selection.
 
+See
+xref:core/expressions/language-ref/operator-safe-navigation.adoc#expressions-operator-safe-navigation-selection-and-projection[Safe Collection Selection and Projection]
+for details.
+====
 

framework-docs/modules/ROOT/pages/core/expressions/language-ref/functions.adoc

@@ -1,10 +1,26 @@
 [[expressions-ref-functions]]
 = Functions
 
-You can extend SpEL by registering user-defined functions that can be called within the
-expression string. The function is registered through the `EvaluationContext`. The
-following example shows how to register a user-defined function to be invoked via reflection
-(i.e. a `Method`):
+You can extend SpEL by registering user-defined functions that can be called within
+expressions by using the `#functionName(...)` syntax. Functions can be registered as
+variables in `EvaluationContext` implementations via the `setVariable()` method.
+
+[TIP]
+====
+`StandardEvaluationContext` also defines `registerFunction(...)` methods that provide a
+convenient way to register a function as a `java.lang.reflect.Method` or a
+`java.lang.invoke.MethodHandle`.
+====
+
+[WARNING]
+====
+Since functions share a common namespace with
+xref:core/expressions/language-ref/variables.adoc[variables] in the evaluation context,
+care must be taken to ensure that function names and variable names do not overlap.
+====
+
+The following example shows how to register a user-defined function to be invoked via
+reflection using a `java.lang.reflect.Method`:
 
 [tabs]
 ======
@@ -40,11 +56,7 @@ Java::
 	public abstract class StringUtils {
 
 		public static String reverseString(String input) {
-			StringBuilder backwards = new StringBuilder(input.length());
-			for (int i = 0; i < input.length(); i++) {
-				backwards.append(input.charAt(input.length() - 1 - i));
-			}
-			return backwards.toString();
+			return new StringBuilder(input).reverse().toString();
 		}
 	}
 ----
@@ -54,16 +66,12 @@ Kotlin::
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 ----
 	fun reverseString(input: String): String {
-		val backwards = StringBuilder(input.length)
-		for (i in 0 until input.length) {
-			backwards.append(input[input.length - 1 - i])
-		}
-		return backwards.toString()
+		return StringBuilder(input).reverse().toString()
 	}
 ----
 ======
 
-You can then register and use the preceding method, as the following example shows:
+You can register and use the preceding method, as the following example shows:
 
 [tabs]
 ======
@@ -75,8 +83,9 @@ Java::
 
 	EvaluationContext context = SimpleEvaluationContext.forReadOnlyDataBinding().build();
 	context.setVariable("reverseString",
-			StringUtils.class.getDeclaredMethod("reverseString", String.class));
+			StringUtils.class.getMethod("reverseString", String.class));
 
+	// evaluates to "olleh"
 	String helloWorldReversed = parser.parseExpression(
 			"#reverseString('hello')").getValue(context, String.class);
 ----
@@ -88,16 +97,18 @@ Kotlin::
 	val parser = SpelExpressionParser()
 
 	val context = SimpleEvaluationContext.forReadOnlyDataBinding().build()
-	context.setVariable("reverseString", ::reverseString::javaMethod)
+	context.setVariable("reverseString", ::reverseString.javaMethod)
 
+	// evaluates to "olleh"
 	val helloWorldReversed = parser.parseExpression(
 			"#reverseString('hello')").getValue(context, String::class.java)
 ----
 ======
 
-The use of `MethodHandle` is also supported. This enables potentially more efficient use
-cases if the `MethodHandle` target and parameters have been fully bound prior to
-registration, but partially bound handles are also supported.
+A function can also be registered as a `java.lang.invoke.MethodHandle`. This enables
+potentially more efficient use cases if the `MethodHandle` target and parameters have
+been fully bound prior to registration; however, partially bound handles are also
+supported.
 
 Consider the `String#formatted(String, Object...)` instance method, which produces a
 message according to a template and a variable number of arguments.
@@ -118,9 +129,9 @@ Java::
 			MethodType.methodType(String.class, Object[].class));
 	context.setVariable("message", mh);
 
+	// evaluates to "Simple message: <Hello World>"
 	String message = parser.parseExpression("#message('Simple message: <%s>', 'Hello World', 'ignored')")
 			.getValue(context, String.class);
-	//returns "Simple message: <Hello World>"
 ----
 
 Kotlin::
@@ -134,6 +145,7 @@ Kotlin::
 			MethodType.methodType(String::class.java, Array<Any>::class.java))
 	context.setVariable("message", mh)
 
+	// evaluates to "Simple message: <Hello World>"
 	val message = parser.parseExpression("#message('Simple message: <%s>', 'Hello World', 'ignored')")
 			.getValue(context, String::class.java)
 ----
@@ -161,9 +173,9 @@ Java::
 			.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!>"
 	String message = parser.parseExpression("#message()")
 			.getValue(context, String.class);
-	//returns "This is a prerecorded message with 3 words: <Oh Hello World!>"
 ----
 
 Kotlin::
@@ -182,6 +194,7 @@ Kotlin::
 			.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!>"
 	val message = parser.parseExpression("#message()")
 			.getValue(context, String::class.java)
 ----

framework-docs/modules/ROOT/pages/core/expressions/language-ref/literal.adoc

@@ -3,20 +3,46 @@
 
 SpEL supports the following types of literal expressions.
 
-- strings
-- numeric values: integer (`int` or `long`), hexadecimal (`int` or `long`), real (`float`
-  or `double`)
-- boolean values: `true` or `false`
-- null
+String ::
+  Strings can be delimited by single quotation marks (`'`) or double quotation marks
+  (`"`). To include a single quotation mark within a string literal enclosed in single
+  quotation marks, use two adjacent single quotation mark characters. Similarly, to
+  include a double quotation mark within a string literal enclosed in double quotation
+  marks, use two adjacent double quotation mark characters.
+Number ::
+  Numbers support the use of the negative sign, exponential notation, and decimal points.
+  * Integer: `int` or `long`
+  * Hexadecimal: `int` or `long`
+  * Real: `float` or `double`
+  ** By default, real numbers are parsed using `Double.parseDouble()`.
+Boolean ::
+  `true` or `false`
+Null ::
+  `null`
 
-Strings can delimited by single quotation marks (`'`) or double quotation marks (`"`). To
-include a single quotation mark within a string literal enclosed in single quotation
-marks, use two adjacent single quotation mark characters. Similarly, to include a double
-quotation mark within a string literal enclosed in double quotation marks, use two
-adjacent double quotation mark characters.
+[NOTE]
+====
+Due to the design and implementation of the Spring Expression Language, literal numbers
+are always stored internally as positive numbers.
 
-Numbers support the use of the negative sign, exponential notation, and decimal points.
-By default, real numbers are parsed by using `Double.parseDouble()`.
+For example, `-2` is stored internally as a positive `2` which is then negated while
+evaluating the expression (by calculating the value of `0 - 2`).
+
+This means that it is not possible to represent a negative literal number equal to the
+minimum value of that type of number in Java. For example, the minimum supported value
+for an `int` in Java is `Integer.MIN_VALUE` which has a value of `-2147483648`. However,
+if you include `-2147483648` in a SpEL expression, an exception will be thrown informing
+you that the value `2147483648` cannot be parsed as an `int` (because it exceeds the
+value of `Integer.MAX_VALUE` which is `2147483647`).
+
+If you need to use the minimum value for a particular type of number within a SpEL
+expression, you can either reference the `MIN_VALUE` constant for the respective wrapper
+type (such as `Integer.MIN_VALUE`, `Long.MIN_VALUE`, etc.) or calculate the minimum
+value. For example, to use the minimum integer value:
+
+- `T(Integer).MIN_VALUE` -- requires a `StandardEvaluationContext`
+- `-2^31` -- can be used with any type of `EvaluationContext`
+====
 
 The following listing shows simple usage of literals. Typically, they are not used in
 isolation like this but, rather, as part of a more complex expression -- for example,

framework-docs/modules/ROOT/pages/core/expressions/language-ref/operator-safe-navigation.adoc

@@ -1,12 +1,27 @@
 [[expressions-operator-safe-navigation]]
 = Safe Navigation Operator
 
-The safe navigation operator is used to avoid a `NullPointerException` and comes from
-the https://www.groovy-lang.org/operators.html#_safe_navigation_operator[Groovy]
-language. Typically, when you have a reference to an object, you might need to verify that
-it is not null before accessing methods or properties of the object. To avoid this, the
-safe navigation operator returns null instead of throwing an exception. The following
-example shows how to use the safe navigation operator:
+The safe navigation operator (`?`) is used to avoid a `NullPointerException` and comes
+from the https://www.groovy-lang.org/operators.html#_safe_navigation_operator[Groovy]
+language. Typically, when you have a reference to an object, you might need to verify
+that it is not `null` before accessing methods or properties of the object. To avoid
+this, the safe navigation operator returns `null` for the particular null-safe operation
+instead of throwing an exception.
+
+[WARNING]
+====
+When the safe navigation operator evaluates to `null` for a particular null-safe
+operation within a compound expression, the remainder of the compound expression will
+still be evaluated.
+
+See <<expressions-operator-safe-navigation-compound-expressions>> for details.
+====
+
+[[expressions-operator-safe-navigation-property-access]]
+== Safe Property and Method Access
+
+The following example shows how to use the safe navigation operator for property access
+(`?.`).
 
 [tabs]
 ======
@@ -20,13 +35,18 @@ Java::
 	Inventor tesla = new Inventor("Nikola Tesla", "Serbian");
 	tesla.setPlaceOfBirth(new PlaceOfBirth("Smiljan"));
 
-	String city = parser.parseExpression("placeOfBirth?.city").getValue(context, tesla, String.class);
-	System.out.println(city);  // Smiljan
+	// evaluates to "Smiljan"
+	String city = parser.parseExpression("placeOfBirth?.city") // <1>
+			.getValue(context, tesla, String.class);
 
 	tesla.setPlaceOfBirth(null);
-	city = parser.parseExpression("placeOfBirth?.city").getValue(context, tesla, String.class);
-	System.out.println(city);  // null - does not throw NullPointerException!!!
+
+	// evaluates to null - does not throw NullPointerException
+	city = parser.parseExpression("placeOfBirth?.city") // <2>
+			.getValue(context, tesla, String.class);	
 ----
+<1> Use safe navigation operator on non-null `placeOfBirth` property
+<2> Use safe navigation operator on null `placeOfBirth` property
 
 Kotlin::
 +
@@ -38,14 +58,306 @@ Kotlin::
 	val tesla = Inventor("Nikola Tesla", "Serbian")
 	tesla.setPlaceOfBirth(PlaceOfBirth("Smiljan"))
 
-	var city = parser.parseExpression("placeOfBirth?.city").getValue(context, tesla, String::class.java)
-	println(city)  // Smiljan
+	// evaluates to "Smiljan"
+	var city = parser.parseExpression("placeOfBirth?.city") // <1>
+			.getValue(context, tesla, String::class.java)
 
 	tesla.setPlaceOfBirth(null)
-	city = parser.parseExpression("placeOfBirth?.city").getValue(context, tesla, String::class.java)
-	println(city)  // null - does not throw NullPointerException!!!
+
+	// evaluates to null - does not throw NullPointerException
+	city = parser.parseExpression("placeOfBirth?.city") // <2>
+			.getValue(context, tesla, String::class.java)
 ----
+<1> Use safe navigation operator on non-null `placeOfBirth` property
+<2> Use safe navigation operator on null `placeOfBirth` property
+======
+
+[NOTE]
+====
+The safe navigation operator also applies to method invocations on an object.
+
+For example, the expression `#calculator?.max(4, 2)` evaluates to `null` if the
+`#calculator` variable has not been configured in the context. Otherwise, the
+`max(int, int)` method will be invoked on the `#calculator`.
+====
+
+
+[[expressions-operator-safe-navigation-selection-and-projection]]
+== Safe Collection Selection and Projection
+
+The Spring Expression Language supports safe navigation for
+xref:core/expressions/language-ref/collection-selection.adoc[collection selection] and
+xref:core/expressions/language-ref/collection-projection.adoc[collection projection] via
+the following operators.
+
+* null-safe selection: `?.?`
+* null-safe select first: `?.^`
+* null-safe select last: `?.$`
+* null-safe projection: `?.!`
+
+The following example shows how to use the safe navigation operator for collection
+selection (`?.?`).
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	ExpressionParser parser = new SpelExpressionParser();
+	IEEE society = new IEEE();
+	StandardEvaluationContext context = new StandardEvaluationContext(society);
+	String expression = "members?.?[nationality == 'Serbian']"; // <1>
+
+	// evaluates to [Inventor("Nikola Tesla")]
+	List<Inventor> list = (List<Inventor>) parser.parseExpression(expression)
+			.getValue(context);
+
+	society.members = null;
+
+	// evaluates to null - does not throw a NullPointerException
+	list = (List<Inventor>) parser.parseExpression(expression)
+			.getValue(context);
+----
+<1> Use null-safe selection operator on potentially null `members` list
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	val parser = SpelExpressionParser()
+	val society = IEEE()
+	val context = StandardEvaluationContext(society)
+	val expression = "members?.?[nationality == 'Serbian']" // <1>
+
+	// evaluates to [Inventor("Nikola Tesla")]
+	var list = parser.parseExpression(expression)
+			.getValue(context) as List<Inventor>
+
+	society.members = null
+
+	// evaluates to null - does not throw a NullPointerException
+	list = parser.parseExpression(expression)
+			.getValue(context) as List<Inventor>
+----
+<1> Use null-safe selection operator on potentially null `members` list
+======
+
+The following example shows how to use the "null-safe select first" operator for
+collections (`?.^`).
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	ExpressionParser parser = new SpelExpressionParser();
+	IEEE society = new IEEE();
+	StandardEvaluationContext context = new StandardEvaluationContext(society);
+	String expression =
+		"members?.^[nationality == 'Serbian' || nationality == 'Idvor']"; // <1>
+
+	// evaluates to Inventor("Nikola Tesla")
+	Inventor inventor = parser.parseExpression(expression)
+			.getValue(context, Inventor.class);
+
+	society.members = null;
+
+	// evaluates to null - does not throw a NullPointerException
+	inventor = parser.parseExpression(expression)
+			.getValue(context, Inventor.class);
+----
+<1> Use "null-safe select first" operator on potentially null `members` list
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	val parser = SpelExpressionParser()
+	val society = IEEE()
+	val context = StandardEvaluationContext(society)
+	val expression =
+		"members?.^[nationality == 'Serbian' || nationality == 'Idvor']" // <1>
+
+	// evaluates to Inventor("Nikola Tesla")
+	var inventor = parser.parseExpression(expression)
+			.getValue(context, Inventor::class.java)
+
+	society.members = null
+
+	// evaluates to null - does not throw a NullPointerException
+	inventor = parser.parseExpression(expression)
+			.getValue(context, Inventor::class.java)
+----
+<1> Use "null-safe select first" operator on potentially null `members` list
 ======
 
 
+The following example shows how to use the "null-safe select last" operator for
+collections (`?.$`).
 
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	ExpressionParser parser = new SpelExpressionParser();
+	IEEE society = new IEEE();
+	StandardEvaluationContext context = new StandardEvaluationContext(society);
+	String expression =
+		"members?.$[nationality == 'Serbian' || nationality == 'Idvor']"; // <1>
+
+	// evaluates to Inventor("Pupin")
+	Inventor inventor = parser.parseExpression(expression)
+			.getValue(context, Inventor.class);
+
+	society.members = null;
+
+	// evaluates to null - does not throw a NullPointerException
+	inventor = parser.parseExpression(expression)
+			.getValue(context, Inventor.class);
+----
+<1> Use "null-safe select last" operator on potentially null `members` list
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	val parser = SpelExpressionParser()
+	val society = IEEE()
+	val context = StandardEvaluationContext(society)
+	val expression =
+		"members?.$[nationality == 'Serbian' || nationality == 'Idvor']" // <1>
+
+	// evaluates to Inventor("Pupin")
+	var inventor = parser.parseExpression(expression)
+			.getValue(context, Inventor::class.java)
+
+	society.members = null
+
+	// evaluates to null - does not throw a NullPointerException
+	inventor = parser.parseExpression(expression)
+			.getValue(context, Inventor::class.java)
+----
+<1> Use "null-safe select last" operator on potentially null `members` list
+======
+
+The following example shows how to use the safe navigation operator for collection
+projection (`?.!`).
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	ExpressionParser parser = new SpelExpressionParser();
+	IEEE society = new IEEE();
+	StandardEvaluationContext context = new StandardEvaluationContext(society);
+
+	// evaluates to ["Smiljan", "Idvor"]
+	List placesOfBirth = parser.parseExpression("members?.![placeOfBirth.city]") // <1>
+			.getValue(context, List.class);
+
+	society.members = null;
+
+	// evaluates to null - does not throw a NullPointerException
+	placesOfBirth = parser.parseExpression("members?.![placeOfBirth.city]") // <2>
+			.getValue(context, List.class);
+----
+<1> Use null-safe projection operator on non-null `members` list
+<2> Use null-safe projection operator on null `members` list
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	val parser = SpelExpressionParser()
+	val society = IEEE()
+	val context = StandardEvaluationContext(society)
+
+	// evaluates to ["Smiljan", "Idvor"]
+	var placesOfBirth = parser.parseExpression("members?.![placeOfBirth.city]") // <1>
+			.getValue(context, List::class.java)
+
+	society.members = null
+
+	// evaluates to null - does not throw a NullPointerException
+	placesOfBirth = parser.parseExpression("members?.![placeOfBirth.city]") // <2>
+			.getValue(context, List::class.java)
+----
+<1> Use null-safe projection operator on non-null `members` list
+<2> Use null-safe projection operator on null `members` list
+======
+
+
+[[expressions-operator-safe-navigation-compound-expressions]]
+== Null-safe Operations in Compound Expressions
+
+As mentioned at the beginning of this section, when the safe navigation operator
+evaluates to `null` for a particular null-safe operation within a compound expression,
+the remainder of the compound expression will still be evaluated. This means that the
+safe navigation operator must be applied throughout a compound expression in order to
+avoid any unwanted `NullPointerException`.
+
+Given the expression `#person?.address.city`, if `#person` is `null` the safe navigation
+operator (`?.`) ensures that no exception will be thrown when attempting to access the
+`address` property of `#person`. However, since `#person?.address` evaluates to `null`, a
+`NullPointerException` will be thrown when attempting to access the `city` property of
+`null`. To address that, you can apply null-safe navigation throughout the compound
+expression as in `#person?.address?.city`. That expression will safely evaluate to `null`
+if either `#person` or `#person?.address` evaluates to `null`.
+
+The following example demonstrates how to use the "null-safe select first" operator
+(`?.^`) on a collection combined with null-safe property access (`?.`) within a compound
+expression. If `members` is `null`, the result of the "null-safe select first" operator
+(`members?.^[nationality == 'Serbian']`) evaluates to `null`, and the additional use of
+the safe navigation operator (`?.name`) ensures that the entire compound expression
+evaluates to `null` instead of throwing an exception.
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	ExpressionParser parser = new SpelExpressionParser();
+	IEEE society = new IEEE();
+	StandardEvaluationContext context = new StandardEvaluationContext(society);
+	String expression = "members?.^[nationality == 'Serbian']?.name"; // <1>
+
+	// evaluates to "Nikola Tesla"
+	String name = parser.parseExpression(expression)
+			.getValue(context, String.class);
+
+	society.members = null;
+
+	// evaluates to null - does not throw a NullPointerException
+	name = parser.parseExpression(expression)
+			.getValue(context, String.class);
+----
+<1> Use "null-safe select first" and null-safe property access operators within compound expression.
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	val parser = SpelExpressionParser()
+	val society = IEEE()
+	val context = StandardEvaluationContext(society)
+	val expression = "members?.^[nationality == 'Serbian']?.name" // <1>
+
+	// evaluates to "Nikola Tesla"
+	String name = parser.parseExpression(expression)
+			.getValue(context, String::class.java)
+
+	society.members = null
+
+	// evaluates to null - does not throw a NullPointerException
+	name = parser.parseExpression(expression)
+			.getValue(context, String::class.java)
+----
+<1> Use "null-safe select first" and null-safe property access operators within compound expression.
+======

framework-docs/modules/ROOT/pages/core/expressions/language-ref/operators.adoc

@@ -5,8 +5,11 @@ The Spring Expression Language supports the following kinds of operators:
 
 * xref:core/expressions/language-ref/operators.adoc#expressions-operators-relational[Relational Operators]
 * xref:core/expressions/language-ref/operators.adoc#expressions-operators-logical[Logical Operators]
+* xref:core/expressions/language-ref/operators.adoc#expressions-operators-string[String Operators]
 * xref:core/expressions/language-ref/operators.adoc#expressions-operators-mathematical[Mathematical Operators]
 * xref:core/expressions/language-ref/operators.adoc#expressions-assignment[The Assignment Operator]
+* xref:core/expressions/language-ref/operators.adoc#expressions-operators-overloaded[Overloaded Operators]
+
 
 
 [[expressions-operators-relational]]
@@ -15,7 +18,7 @@ The Spring Expression Language supports the following kinds of operators:
 The relational operators (equal, not equal, less than, less than or equal, greater than,
 and greater than or equal) are supported by using standard operator notation.
 These operators work on `Number` types as well as types implementing `Comparable`.
-The following listing shows a few examples of operators:
+The following listing shows a few examples of relational operators:
 
 [tabs]
 ======
@@ -65,53 +68,9 @@ If you prefer numeric comparisons instead, avoid number-based `null` comparisons
 in favor of comparisons against zero (for example, `X > 0` or `X < 0`).
 ====
 
-In addition to the standard relational operators, SpEL supports the `instanceof` and regular
-expression-based `matches` operator. The following listing shows examples of both:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes",role="primary"]
-----
-	// evaluates to false
-	boolean falseValue = parser.parseExpression(
-			"'xyz' instanceof T(Integer)").getValue(Boolean.class);
-
-	// evaluates to true
-	boolean trueValue = parser.parseExpression(
-			"'5.00' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean.class);
-
-	// evaluates to false
-	boolean falseValue = parser.parseExpression(
-			"'5.0067' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean.class);
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
-----
-	// evaluates to false
-	val falseValue = parser.parseExpression(
-			"'xyz' instanceof T(Integer)").getValue(Boolean::class.java)
-
-	// evaluates to true
-	val trueValue = parser.parseExpression(
-			"'5.00' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean::class.java)
-
-	// evaluates to false
-	val falseValue = parser.parseExpression(
-			"'5.0067' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean::class.java)
-----
-======
-
-CAUTION: Be careful with primitive types, as they are immediately boxed up to their
-wrapper types. For example, `1 instanceof T(int)` evaluates to `false`, while
-`1 instanceof T(Integer)` evaluates to `true`, as expected.
-
-Each symbolic operator can also be specified as a purely alphabetic equivalent. This
-avoids problems where the symbols used have special meaning for the document type in
-which the expression is embedded (such as in an XML document). The textual equivalents are:
+Each symbolic operator can also be specified as a purely textual equivalent. This avoids
+problems where the symbols used have special meaning for the document type in which the
+expression is embedded (such as in an XML document). The textual equivalents are:
 
 * `lt` (`<`)
 * `gt` (`>`)
@@ -119,22 +78,117 @@ which the expression is embedded (such as in an XML document). The textual equiv
 * `ge` (`>=`)
 * `eq` (`==`)
 * `ne` (`!=`)
-* `div` (`/`)
-* `mod` (`%`)
-* `not` (`!`).
 
 All of the textual operators are case-insensitive.
 
+In addition to the standard relational operators, SpEL supports the `between`,
+`instanceof`, and regular expression-based `matches` operators. The following listing
+shows examples of all three:
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	boolean result;
+
+	// evaluates to true
+	result = parser.parseExpression(
+			"1 between {1, 5}").getValue(Boolean.class);
+
+	// evaluates to false
+	result = parser.parseExpression(
+			"1 between {10, 15}").getValue(Boolean.class);
+
+	// evaluates to true
+	result = parser.parseExpression(
+			"'elephant' between {'aardvark', 'zebra'}").getValue(Boolean.class);
+
+	// evaluates to false
+	result = parser.parseExpression(
+			"'elephant' between {'aardvark', 'cobra'}").getValue(Boolean.class);
+
+	// evaluates to true
+	result = parser.parseExpression(
+			"123 instanceof T(Integer)").getValue(Boolean.class);
+
+	// evaluates to false
+	result = parser.parseExpression(
+			"'xyz' instanceof T(Integer)").getValue(Boolean.class);
+
+	// evaluates to true
+	result = parser.parseExpression(
+			"'5.00' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean.class);
+
+	// evaluates to false
+	result = parser.parseExpression(
+			"'5.0067' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean.class);
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	// evaluates to true
+	var result = parser.parseExpression(
+			"1 between {1, 5}").getValue(Boolean::class.java)
+
+	// evaluates to false
+	result = parser.parseExpression(
+			"1 between {10, 15}").getValue(Boolean::class.java)
+
+	// evaluates to true
+	result = parser.parseExpression(
+			"'elephant' between {'aardvark', 'zebra'}").getValue(Boolean::class.java)
+
+	// evaluates to false
+	result = parser.parseExpression(
+			"'elephant' between {'aardvark', 'cobra'}").getValue(Boolean::class.java)
+
+	// evaluates to true
+	result = parser.parseExpression(
+			"123 instanceof T(Integer)").getValue(Boolean::class.java)
+
+	// evaluates to false
+	result = parser.parseExpression(
+			"'xyz' instanceof T(Integer)").getValue(Boolean::class.java)
+
+	// evaluates to true
+	result = parser.parseExpression(
+			"'5.00' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean::class.java)
+
+	// evaluates to false
+	result = parser.parseExpression(
+			"'5.0067' matches '^-?\\d+(\\.\\d{2})?$'").getValue(Boolean::class.java)
+----
+======
+
+[CAUTION]
+====
+The syntax for the `between` operator is `<input> between {<range_begin>, <range_end>}`,
+which is effectively a shortcut for `<input> >= <range_begin> && <input> \<= <range_end>}`.
+
+Consequently, `1 between {1, 5}` evaluates to `true`, while `1 between {5, 1}` evaluates
+to `false`.
+====
+
+CAUTION: Be careful with primitive types, as they are immediately boxed up to their
+wrapper types. For example, `1 instanceof T(int)` evaluates to `false`, while
+`1 instanceof T(Integer)` evaluates to `true`.
+
 
 [[expressions-operators-logical]]
 == Logical Operators
 
-SpEL supports the following logical operators:
+SpEL supports the following logical (`boolean`) operators:
 
 * `and` (`&&`)
 * `or` (`||`)
 * `not` (`!`)
 
+All of the textual operators are case-insensitive.
+
 The following example shows how to use the logical operators:
 
 [tabs]
@@ -167,6 +221,7 @@ Java::
 	boolean falseValue = parser.parseExpression("!true").getValue(Boolean.class);
 
 	// -- AND and NOT --
+
 	String expression = "isMember('Nikola Tesla') and !isMember('Mihajlo Pupin')";
 	boolean falseValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);
 ----
@@ -199,20 +254,24 @@ Kotlin::
 	val falseValue = parser.parseExpression("!true").getValue(Boolean::class.java)
 
 	// -- AND and NOT --
+
 	val expression = "isMember('Nikola Tesla') and !isMember('Mihajlo Pupin')"
 	val falseValue = parser.parseExpression(expression).getValue(societyContext, Boolean::class.java)
 ----
 ======
 
 
-[[expressions-operators-mathematical]]
-== Mathematical Operators
+[[expressions-operators-string]]
+== String Operators
 
-You can use the addition operator (`+`) on both numbers and strings. You can use the
-subtraction (`-`), multiplication (`*`), and division (`/`) operators only on numbers.
-You can also use the modulus (`%`) and exponential power (`^`) operators on numbers.
-Standard operator precedence is enforced. The following example shows the mathematical
-operators in use:
+You can use the following operators on strings.
+
+* concatenation (`+`)
+* subtraction (`-`)
+  - for use with a string containing a single character
+* repeat (`*`)
+
+The following example shows the `String` operators in use:
 
 [tabs]
 ======
@@ -220,67 +279,212 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 ----
-	// Addition
-	int two = parser.parseExpression("1 + 1").getValue(Integer.class);  // 2
+	// -- Concatenation --
 
-	String testString = parser.parseExpression(
-			"'test' + ' ' + 'string'").getValue(String.class);  // 'test string'
+	// evaluates to "hello world"
+	String helloWorld = parser.parseExpression("'hello' + ' ' + 'world'")
+			.getValue(String.class);
 
-	// Subtraction
-	int four = parser.parseExpression("1 - -3").getValue(Integer.class);  // 4
+	// -- Character Subtraction --
 
-	double d = parser.parseExpression("1000.00 - 1e4").getValue(Double.class);  // -9000
+	// evaluates to 'a'
+	char ch = parser.parseExpression("'d' - 3")
+			.getValue(char.class);
 
-	// Multiplication
-	int six = parser.parseExpression("-2 * -3").getValue(Integer.class);  // 6
+	// -- Repeat --
 
-	double twentyFour = parser.parseExpression("2.0 * 3e0 * 4").getValue(Double.class);  // 24.0
-
-	// Division
-	int minusTwo = parser.parseExpression("6 / -3").getValue(Integer.class);  // -2
-
-	double one = parser.parseExpression("8.0 / 4e0 / 2").getValue(Double.class);  // 1.0
-
-	// Modulus
-	int three = parser.parseExpression("7 % 4").getValue(Integer.class);  // 3
-
-	int one = parser.parseExpression("8 / 5 % 2").getValue(Integer.class);  // 1
-
-	// Operator precedence
-	int minusTwentyOne = parser.parseExpression("1+2-3*8").getValue(Integer.class);  // -21
+	// evaluates to "abcabc"
+	String repeated = parser.parseExpression("'abc' * 2")
+			.getValue(String.class);
 ----
 
 Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 ----
-	// Addition
-	val two = parser.parseExpression("1 + 1").getValue(Int::class.java)  // 2
+	// -- Concatenation --
 
-	val testString = parser.parseExpression(
-			"'test' + ' ' + 'string'").getValue(String::class.java)  // 'test string'
+	// evaluates to "hello world"
+	val helloWorld = parser.parseExpression("'hello' + ' ' + 'world'")
+			.getValue(String::class.java)
+
+	// -- Character Subtraction --
+
+	// evaluates to 'a'
+	val ch = parser.parseExpression("'d' - 3")
+			.getValue(Character::class.java);
+
+	// -- Repeat --
+
+	// evaluates to "abcabc"
+	val repeated = parser.parseExpression("'abc' * 2")
+			.getValue(String::class.java);
+----
+======
+
+[[expressions-operators-mathematical]]
+== Mathematical Operators
+
+You can use the following operators on numbers, and standard operator precedence is enforced.
+
+* addition (`+`)
+* subtraction (`-`)
+* increment (`{pp}`)
+* decrement (`--`)
+* multiplication (`*`)
+* division (`/`)
+* modulus (`%`)
+* exponential power (`^`)
+
+The division and modulus operators can also be specified as a purely textual equivalent.
+This avoids problems where the symbols used have special meaning for the document type in
+which the expression is embedded (such as in an XML document). The textual equivalents
+are:
+
+* `div` (`/`)
+* `mod` (`%`)
+
+All of the textual operators are case-insensitive.
+
+[NOTE]
+====
+The increment and decrement operators can be used with either prefix (`{pp}A`, `--A`) or
+postfix (`A{pp}`, `A--`) notation with variables or properties that can be written to.
+====
+
+The following example shows the mathematical operators in use:
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	Inventor inventor = new Inventor();
+	EvaluationContext context = SimpleEvaluationContext.forReadWriteDataBinding().build();
+
+	// -- Addition --
+
+	int two = parser.parseExpression("1 + 1").getValue(int.class);  // 2
+
+	// -- Subtraction --
+
+	int four = parser.parseExpression("1 - -3").getValue(int.class);  // 4
+
+	double d = parser.parseExpression("1000.00 - 1e4").getValue(double.class);  // -9000
+
+	// -- Increment --
+
+	// The counter property in Inventor has an initial value of 0.
+
+	// evaluates to 2; counter is now 1
+	two = parser.parseExpression("counter++ + 2").getValue(context, inventor, int.class);
+
+	// evaluates to 5; counter is now 2
+	int five = parser.parseExpression("3 + ++counter").getValue(context, inventor, int.class);
+
+	// -- Decrement --
+
+	// The counter property in Inventor has a value of 2.
+
+	// evaluates to 6; counter is now 1
+	int six = parser.parseExpression("counter-- + 4").getValue(context, inventor, int.class);
+
+	// evaluates to 5; counter is now 0
+	five = parser.parseExpression("5 + --counter").getValue(context, inventor, int.class);
+
+	// -- Multiplication --
+
+	six = parser.parseExpression("-2 * -3").getValue(int.class);  // 6
+
+	double twentyFour = parser.parseExpression("2.0 * 3e0 * 4").getValue(double.class);  // 24.0
+
+	// -- Division --
+
+	int minusTwo = parser.parseExpression("6 / -3").getValue(int.class);  // -2
+
+	double one = parser.parseExpression("8.0 / 4e0 / 2").getValue(double.class);  // 1.0
+
+	// -- Modulus --
+
+	int three = parser.parseExpression("7 % 4").getValue(int.class);  // 3
+
+	int oneInt = parser.parseExpression("8 / 5 % 2").getValue(int.class);  // 1
+
+	// -- Exponential power --
+
+	int maxInt = parser.parseExpression("(2^31) - 1").getValue(int.class);  // Integer.MAX_VALUE
+
+	int minInt = parser.parseExpression("-2^31").getValue(int.class);  // Integer.MIN_VALUE
+
+	// -- Operator precedence --
+
+	int minusTwentyOne = parser.parseExpression("1+2-3*8").getValue(int.class);  // -21
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	val inventor = Inventor()
+	val context = SimpleEvaluationContext.forReadWriteDataBinding().build()
+
+	// -- Addition --
+
+	var two = parser.parseExpression("1 + 1").getValue(Int::class.java)  // 2
+
+	// -- Subtraction --
 
-	// Subtraction
 	val four = parser.parseExpression("1 - -3").getValue(Int::class.java)  // 4
 
 	val d = parser.parseExpression("1000.00 - 1e4").getValue(Double::class.java)  // -9000
 
-	// Multiplication
-	val six = parser.parseExpression("-2 * -3").getValue(Int::class.java)  // 6
+	// -- Increment --
+
+	// The counter property in Inventor has an initial value of 0.
+
+	// evaluates to 2; counter is now 1
+	two = parser.parseExpression("counter++ + 2").getValue(context, inventor, Int::class.java)
+
+	// evaluates to 5; counter is now 2
+	var five = parser.parseExpression("3 + ++counter").getValue(context, inventor, Int::class.java)
+
+	// -- Decrement --
+
+	// The counter property in Inventor has a value of 2.
+
+	// evaluates to 6; counter is now 1
+	var six = parser.parseExpression("counter-- + 4").getValue(context, inventor, Int::class.java)
+
+	// evaluates to 5; counter is now 0
+	five = parser.parseExpression("5 + --counter").getValue(context, inventor, Int::class.java)
+
+	// -- Multiplication --
+
+	six = parser.parseExpression("-2 * -3").getValue(Int::class.java)  // 6
 
 	val twentyFour = parser.parseExpression("2.0 * 3e0 * 4").getValue(Double::class.java)  // 24.0
 
-	// Division
+	// -- Division --
+
 	val minusTwo = parser.parseExpression("6 / -3").getValue(Int::class.java)  // -2
 
 	val one = parser.parseExpression("8.0 / 4e0 / 2").getValue(Double::class.java)  // 1.0
 
-	// Modulus
+	// -- Modulus --
+
 	val three = parser.parseExpression("7 % 4").getValue(Int::class.java)  // 3
 
-	val one = parser.parseExpression("8 / 5 % 2").getValue(Int::class.java)  // 1
+	val oneInt = parser.parseExpression("8 / 5 % 2").getValue(Int::class.java)  // 1
+
+	// -- Exponential power --
+
+	val maxInt = parser.parseExpression("(2^31) - 1").getValue(Int::class.java)  // Integer.MAX_VALUE
+
+	val minInt = parser.parseExpression("-2^31").getValue(Int::class.java)  // Integer.MIN_VALUE
+
+	// -- Operator precedence --
 
-	// Operator precedence
 	val minusTwentyOne = parser.parseExpression("1+2-3*8").getValue(Int::class.java)  // -21	
 ----
 ======
@@ -325,3 +529,83 @@ Kotlin::
 ======
 
 
+[[expressions-operators-overloaded]]
+== Overloaded Operators
+
+By default, the mathematical operations defined in SpEL's `Operation` enum (`ADD`,
+`SUBTRACT`, `DIVIDE`, `MULTIPLY`, `MODULUS`, and `POWER`) support simple types like
+numbers. By providing an implementation of `OperatorOverloader`, the expression language
+can support these operations on other types.
+
+For example, if we want to overload the `ADD` operator to allow two lists to be
+concatenated using the `+` sign, we can implement a custom `OperatorOverloader` as
+follows.
+
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	pubic class ListConcatenation implements OperatorOverloader {
+
+		@Override
+		public boolean overridesOperation(Operation operation, Object left, Object right) {
+			return (operation == Operation.ADD &&
+					left instanceof List && right instanceof List);
+		}
+
+		@Override
+		@SuppressWarnings("unchecked")
+		public Object operate(Operation operation, Object left, Object right) {
+			if (operation == Operation.ADD &&
+					left instanceof List list1 && right instanceof List list2) {
+
+				List result = new ArrayList(list1);
+				result.addAll(list2);
+				return result;
+			}
+			throw new UnsupportedOperationException(
+				"No overload for operation %s and operands [%s] and [%s]"
+					.formatted(operation, left, right));
+		}
+	}
+----
+
+If we register `ListConcatenation` as the `OperatorOverloader` in a
+`StandardEvaluationContext`, we can then evaluate expressions like `{1, 2, 3} + {4, 5}`
+as demonstrated in the following example.
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	StandardEvaluationContext context = new StandardEvaluationContext();
+	context.setOperatorOverloader(new ListConcatenation());
+
+	// evaluates to a new list: [1, 2, 3, 4, 5]
+	parser.parseExpression("{1, 2, 3} + {2 + 2, 5}").getValue(context, List.class);
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	StandardEvaluationContext context = StandardEvaluationContext()
+	context.setOperatorOverloader(ListConcatenation())
+
+	// evaluates to a new list: [1, 2, 3, 4, 5]
+	parser.parseExpression("{1, 2, 3} + {2 + 2, 5}").getValue(context, List::class.java)
+----
+======
+
+[NOTE]
+====
+An `OperatorOverloader` does not change the default semantics for an operator. For
+example, `2 + 2` in the above example still evaluates to `4`.
+====
+
+[CAUTION]
+====
+Any expression that uses an overloaded operator cannot be compiled. See
+xref:core/expressions/evaluation.adoc#expressions-compiler-limitations[Compiler Limitations]
+for details.
+====

framework-docs/modules/ROOT/pages/core/expressions/language-ref/templating.adoc

@@ -1,5 +1,5 @@
 [[expressions-templating]]
-= Expression templating
+= Expression Templating
 
 Expression templates allow mixing literal text with one or more evaluation blocks.
 Each evaluation block is delimited with prefix and suffix characters that you can
@@ -32,53 +32,13 @@ Kotlin::
 ======
 
 The string is evaluated by concatenating the literal text `'random number is '` with the
-result of evaluating the expression inside the `#{ }` delimiter (in this case, the result
-of calling that `random()` method). The second argument to the `parseExpression()` method
-is of the type `ParserContext`. The `ParserContext` interface is used to influence how
-the expression is parsed in order to support the expression templating functionality.
-The definition of `TemplateParserContext` follows:
-
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes",role="primary"]
-----
-	public class TemplateParserContext implements ParserContext {
-
-		public String getExpressionPrefix() {
-			return "#{";
-		}
-
-		public String getExpressionSuffix() {
-			return "}";
-		}
-
-		public boolean isTemplate() {
-			return true;
-		}
-	}
-----
-
-Kotlin::
-+
-[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
-----
-	class TemplateParserContext : ParserContext {
-
-		override fun getExpressionPrefix(): String {
-			return "#{"
-		}
-
-		override fun getExpressionSuffix(): String {
-			return "}"
-		}
-
-		override fun isTemplate(): Boolean {
-			return true
-		}
-	}
-----
-======
+result of evaluating the expression inside the `#{ }` delimiters (in this case, the
+result of calling that `random()` method). The second argument to the `parseExpression()`
+method is of the type `ParserContext`. The `ParserContext` interface is used to influence
+how the expression is parsed in order to support the expression templating functionality.
+The `TemplateParserContext` used in the previous example resides in the
+`org.springframework.expression.common` package and is an implementation of the
+`ParserContext` which by default configures the prefix and suffix to `#{` and `}`,
+respectively.
 
 

framework-docs/modules/ROOT/pages/core/expressions/language-ref/variables.adoc

@@ -6,15 +6,36 @@ are set by using the `setVariable()` method in `EvaluationContext` implementatio
 
 [NOTE]
 ====
-Valid variable names must be composed of one or more of the following supported
+Variable names must be begin with a letter (as defined below), an underscore, or a dollar
+sign.
+
+Variable names must be composed of one or more of the following supported types of
 characters.
 
-* letters: `A` to `Z` and `a` to `z`
-* digits: `0` to `9`
+* letter: any character for which `java.lang.Character.isLetter(char)` returns `true`
+  - This includes letters such as `A` to `Z`, `a` to `z`, `ü`, `ñ`, and `é` as well as
+    letters from other character sets such as Chinese, Japanese, Cyrillic, etc.
+* digit: `0` to `9`
 * underscore: `_`
 * dollar sign: `$`
 ====
 
+[TIP]
+====
+When setting a variable or root context object in the `EvaluationContext`, it is advised
+that the type of the variable or root context object be `public`.
+
+Otherwise, certain types of SpEL expressions involving a variable or root context object
+with a non-public type may fail to evaluate or compile.
+====
+
+[WARNING]
+====
+Since variables share a common namespace with
+xref:core/expressions/language-ref/functions.adoc[functions] in the evaluation context,
+care must be taken to ensure that variable names and functions names do not overlap.
+====
+
 The following example shows how to use variables.
 
 [tabs]

framework-docs/modules/ROOT/pages/core/validation/beanvalidation.adoc

@@ -299,7 +299,7 @@ Java::
 	public class AppConfig {
 
 		@Bean
-		public MethodValidationPostProcessor validationPostProcessor() {
+		public static MethodValidationPostProcessor validationPostProcessor() {
 			return new MethodValidationPostProcessor();
 		}
 	}
@@ -341,7 +341,7 @@ xref:web/webflux/ann-rest-exceptions.adoc[Error Responses] sections.
 === Method Validation Exceptions
 
 By default, `jakarta.validation.ConstraintViolationException` is raised with the set of
-``ConstraintViolation``s returned by `jakarata.validation.Validator`. As an alternative,
+``ConstraintViolation``s returned by `jakarta.validation.Validator`. As an alternative,
 you can have `MethodValidationException` raised instead with ``ConstraintViolation``s
 adapted to `MessageSourceResolvable` errors. To enable set the following flag:
 
@@ -357,7 +357,7 @@ Java::
 	public class AppConfig {
 
 		@Bean
-		public MethodValidationPostProcessor validationPostProcessor() {
+		public static MethodValidationPostProcessor validationPostProcessor() {
 			MethodValidationPostProcessor processor = new MethodValidationPostProcessor();
 			processor.setAdaptConstraintViolations(true);
 			return processor;
@@ -429,7 +429,7 @@ Kotlin::
 ----
 ======
 
-A `ConstraintViolation` on `Person.name()` is adapted to a `FieldErrro` with the following:
+A `ConstraintViolation` on `Person.name()` is adapted to a `FieldError` with the following:
 
 - Error codes `"Size.student.name"`, `"Size.name"`, `"Size.java.lang.String"`, and `"Size"`
 - Message arguments `"name"`, `10`, and `1` (the field name and the constraint attributes)

framework-docs/modules/ROOT/pages/data-access/jdbc/core.adoc

@@ -717,7 +717,7 @@ For example, with positional parameters:
 
 	public int countOfActorsByFirstName(String firstName) {
 		return this.jdbcClient.sql("select count(*) from t_actor where first_name = ?")
-				.param(firstName);
+				.param(firstName)
 				.query(Integer.class).single();
 	}
 ----
@@ -730,7 +730,7 @@ For example, with named parameters:
 
 	public int countOfActorsByFirstName(String firstName) {
 		return this.jdbcClient.sql("select count(*) from t_actor where first_name = :firstName")
-				.param("firstName", firstName);
+				.param("firstName", firstName)
 				.query(Integer.class).single();
 	}
 ----
@@ -759,8 +759,8 @@ With a required single object result:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	Actor actor = this.jdbcClient.sql("select first_name, last_name from t_actor where id = ?",
-			.param(1212L);
+	Actor actor = this.jdbcClient.sql("select first_name, last_name from t_actor where id = ?")
+			.param(1212L)
 			.query(Actor.class)
 			.single();
 ----
@@ -769,8 +769,8 @@ With a `java.util.Optional` result:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	Optional<Actor> actor = this.jdbcClient.sql("select first_name, last_name from t_actor where id = ?",
-			.param(1212L);
+	Optional<Actor> actor = this.jdbcClient.sql("select first_name, last_name from t_actor where id = ?")
+			.param(1212L)
 			.query(Actor.class)
 			.optional();
 ----
@@ -780,7 +780,7 @@ And for an update statement:
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	this.jdbcClient.sql("insert into t_actor (first_name, last_name) values (?, ?)")
-			.param("Leonor").param("Watling");
+			.param("Leonor").param("Watling")
 			.update();
 ----
 
@@ -789,7 +789,7 @@ Or an update statement with named parameters:
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	this.jdbcClient.sql("insert into t_actor (first_name, last_name) values (:firstName, :lastName)")
-			.param("firstName", "Leonor").param("lastName", "Watling");
+			.param("firstName", "Leonor").param("lastName", "Watling")
 			.update();
 ----
 
@@ -800,7 +800,7 @@ provides `firstName` and `lastName` properties, such as the `Actor` class from a
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
 	this.jdbcClient.sql("insert into t_actor (first_name, last_name) values (:firstName, :lastName)")
-			.paramSource(new Actor("Leonor", "Watling");
+			.paramSource(new Actor("Leonor", "Watling")
 			.update();
 ----
 

framework-docs/modules/ROOT/pages/data-access/jdbc/object.adoc

@@ -112,7 +112,7 @@ Java::
 		this.actorMappingQuery = new ActorMappingQuery(dataSource);
 	}
 
-	public Customer getCustomer(Long id) {
+	public Actor getActor(Long id) {
 		return actorMappingQuery.findObject(id);
 	}
 ----
@@ -123,11 +123,11 @@ Kotlin::
 ----
 	private val actorMappingQuery = ActorMappingQuery(dataSource)
 
-	fun getCustomer(id: Long) = actorMappingQuery.findObject(id)
+	fun getActor(id: Long) = actorMappingQuery.findObject(id)
 ----
 ======
 
-The method in the preceding example retrieves the customer with the `id` that is passed in as the
+The method in the preceding example retrieves the actor with the `id` that is passed in as the
 only parameter. Since we want only one object to be returned, we call the `findObject` convenience
 method with the `id` as the parameter. If we had instead a query that returned a
 list of objects and took additional parameters, we would use one of the `execute`

framework-docs/modules/ROOT/pages/data-access/orm/jpa.adoc

@@ -268,8 +268,8 @@ The actual JPA provider bootstrapping is handed off to the specified executor an
 running in parallel, to the application bootstrap thread. The exposed `EntityManagerFactory`
 proxy can be injected into other application components and is even able to respond to
 `EntityManagerFactoryInfo` configuration inspection. However, once the actual JPA provider
-is being accessed by other components (for example, calling `createEntityManager`), those calls
-block until the background bootstrapping has completed. In particular, when you use
+is being accessed by other components (for example, calling `createEntityManager`), those
+calls block until the background bootstrapping has completed. In particular, when you use
 Spring Data JPA, make sure to set up deferred bootstrapping for its repositories as well.
 
 
@@ -284,9 +284,9 @@ to a newly created `EntityManager` per operation, in effect making its usage thr
 
 It is possible to write code against the plain JPA without any Spring dependencies, by
 using an injected `EntityManagerFactory` or `EntityManager`. Spring can understand the
-`@PersistenceUnit` and `@PersistenceContext` annotations both at the field and the method level
-if a `PersistenceAnnotationBeanPostProcessor` is enabled. The following example shows a plain
-JPA DAO implementation that uses the `@PersistenceUnit` annotation:
+`@PersistenceUnit` and `@PersistenceContext` annotations both at the field and the method
+level if a `PersistenceAnnotationBeanPostProcessor` is enabled. The following example
+shows a plain JPA DAO implementation that uses the `@PersistenceUnit` annotation:
 
 [tabs]
 ======

framework-docs/modules/ROOT/pages/data-access/r2dbc.adoc

@@ -440,12 +440,8 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 ----
-	val tuples: MutableList<Array<Any>> = ArrayList()
-	tuples.add(arrayOf("John", 35))
-	tuples.add(arrayOf("Ann", 50))
-
 	client.sql("SELECT id, name, state FROM table WHERE age IN (:ages)")
-		    .bind("tuples", arrayOf(35, 50))
+		    .bind("ages", arrayOf(35, 50))
 ----
 ======
 

framework-docs/modules/ROOT/pages/data-access/transaction/declarative/annotations.adoc

@@ -74,10 +74,11 @@ Kotlin::
 ----
 ======
 
-Used at the class level as above, the annotation indicates a default for all methods of
-the declaring class (as well as its subclasses). Alternatively, each method can be
-annotated individually. See xref:data-access/transaction/declarative/annotations.adoc#transaction-declarative-annotations-method-visibility[method visibility] for
-further details on which methods Spring considers transactional. Note that a class-level
+Used at the class level as above, the annotation indicates a default for all methods
+of the declaring class (as well as its subclasses). Alternatively, each method can be
+annotated individually. See
+xref:data-access/transaction/declarative/annotations.adoc#transaction-declarative-annotations-method-visibility[method visibility]
+for further details on which methods Spring considers transactional. Note that a class-level
 annotation does not apply to ancestor classes up the class hierarchy; in such a scenario,
 inherited methods need to be locally redeclared in order to participate in a
 subclass-level annotation.
@@ -436,9 +437,10 @@ properties of the `@Transactional` annotation:
 | Optional array of exception name patterns that must not cause rollback.
 |===
 
-TIP: See xref:data-access/transaction/declarative/rolling-back.adoc#transaction-declarative-rollback-rules[Rollback rules] for further details
-on rollback rule semantics, patterns, and warnings regarding possible unintentional
-matches for pattern-based rollback rules.
+TIP: See
+xref:data-access/transaction/declarative/rolling-back.adoc#transaction-declarative-rollback-rules[Rollback rules]
+for further details on rollback rule semantics, patterns, and warnings
+regarding possible unintentional matches for pattern-based rollback rules.
 
 Currently, you cannot have explicit control over the name of a transaction, where 'name'
 means the transaction name that appears in a transaction monitor and in logging output.

framework-docs/modules/ROOT/pages/data-access/transaction/declarative/rolling-back.adoc

@@ -23,9 +23,9 @@ As of Spring Framework 5.2, the default configuration also provides support for
 Vavr's `Try` method to trigger transaction rollbacks when it returns a 'Failure'.
 This allows you to handle functional-style errors using Try and have the transaction
 automatically rolled back in case of a failure. For more information on Vavr's Try,
-refer to the [official Vavr documentation](https://www.vavr.io/vavr-docs/#_try).
-
+refer to the https://docs.vavr.io/#_try[official Vavr documentation].
 Here's an example of how to use Vavr's Try with a transactional method:
+
 [tabs]
 ======
 Java::
@@ -42,6 +42,32 @@ Java::
 ----
 ======
 
+As of Spring Framework 6.1, there is also special treatment of `CompletableFuture`
+(and general `Future`) return values, triggering a rollback for such a handle if it
+was exceptionally completed at the time of being returned from the original method.
+This is intended for `@Async` methods where the actual method implementation may
+need to comply with a `CompletableFuture` signature (auto-adapted to an actual
+asynchronous handle for a call to the proxy by `@Async` processing at runtime),
+preferring exposure in the returned handle rather than rethrowing an exception:
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	@Transactional @Async
+	public CompletableFuture<String> myTransactionalMethod() {
+		try {
+			return CompletableFuture.completedFuture(delegate.myDataAccessOperation());
+		}
+		catch (DataAccessException ex) {
+			return CompletableFuture.failedFuture(ex);
+		}
+	}
+----
+======
+
 Checked exceptions that are thrown from a transactional method do not result in a rollback
 in the default configuration. You can configure exactly which `Exception` types mark a
 transaction for rollback, including checked exceptions by specifying _rollback rules_.

framework-docs/modules/ROOT/pages/data-access/transaction/declarative/tx-decl-explained.adoc

@@ -38,6 +38,11 @@ within the method.
 A reactive transaction managed by `ReactiveTransactionManager` uses the Reactor context
 instead of thread-local attributes. As a consequence, all participating data access
 operations need to execute within the same Reactor context in the same reactive pipeline.
+
+When configured with a `ReactiveTransactionManager`, all transaction-demarcated methods
+are expected to return a reactive pipeline. Void methods or regular return types need
+to be associated with a regular `PlatformTransactionManager`, e.g. through the
+`transactionManager` attribute of the corresponding `@Transactional` declarations.
 ====
 
 The following image shows a conceptual view of calling a method on a transactional proxy:

framework-docs/modules/ROOT/pages/index.adoc

@@ -18,7 +18,7 @@ WebSocket, RSocket.
 xref:integration.adoc[Integration] :: REST Clients, JMS, JCA, JMX,
 Email, Tasks, Scheduling, Caching, Observability, JVM Checkpoint Restore.
 xref:languages.adoc[Languages] :: Kotlin, Groovy, Dynamic Languages.
-xref:testing/appendix.adoc[Appendix] :: Spring properties.
+xref:appendix.adoc[Appendix] :: Spring properties.
 {spring-framework-wiki}[Wiki] :: What's New,
 Upgrade Notes, Supported Versions, additional cross-version information.
 
@@ -29,8 +29,6 @@ Brannen, Ramnivas Laddad, Arjen Poutsma, Chris Beams, Tareq Abedrabbo, Andy Clem
 Syer, Oliver Gierke, Rossen Stoyanchev, Phillip Webb, Rob Winch, Brian Clozel, Stephane
 Nicoll, Sebastien Deleuze, Jay Bryant, Mark Paluch
 
-Copyright © 2002 - 2023 VMware, Inc. All Rights Reserved.
-
 Copies of this document may be made for your own use and for distribution to others,
 provided that you do not charge any fee for such copies and further provided that each
-copy contains this Copyright Notice, whether distributed in print or electronically.
+copy contains the Copyright Notice, whether distributed in print or electronically.

framework-docs/modules/ROOT/pages/integration/cds.adoc

@@ -1,5 +1,6 @@
-[[class-data-sharing]]
-= Class Data Sharing
+[[cds]]
+= CDS
+:page-aliases: integration/class-data-sharing.adoc
 
 Class Data Sharing (CDS) is a https://docs.oracle.com/en/java/javase/17/vm/class-data-sharing.html[JVM feature]
 that can help reduce the startup time and memory footprint of Java applications.
@@ -23,7 +24,7 @@ To create the archive, two additional JVM flags must be specified:
 * `-Dspring.context.exit=onRefresh`: starts and then immediately exits your Spring
   application as described above
 
-To create a CDS archive, your JDK must have a base image. If you add the flags above to
+To create a CDS archive, your JDK/JRE must have a base image. If you add the flags above to
 your startup script, you may get a warning that looks like this:
 
 [source,shell,indent=0,subs="verbatim"]
@@ -31,7 +32,8 @@ your startup script, you may get a warning that looks like this:
   -XX:ArchiveClassesAtExit is unsupported when base CDS archive is not loaded. Run with -Xlog:cds for more info.
 ----
 
-The base CDS archive can be created by issuing the following command:
+The base CDS archive is usually provided out-of-the-box, but can also be created if needed by issuing the following
+command:
 
 [source,shell,indent=0,subs="verbatim"]
 ----
@@ -43,6 +45,9 @@ The base CDS archive can be created by issuing the following command:
 Once the archive is available, add `-XX:SharedArchiveFile=application.jsa` to your startup
 script to use it, assuming an `application.jsa` file in the working directory.
 
+To check if the CDS cache is effective, you can use (for testing purposes only, not in production) `-Xshare:on` which
+prints an error message and exits if CDS can't be enabled.
+
 To figure out how effective the cache is, you can enable class loading logs by adding
 an extra attribute: `-Xlog:class+load:file=cds.log`. This creates a `cds.log` with every
 attempt to load a class and its source. Classes that are loaded from the cache should have
@@ -57,8 +62,11 @@ a "shared objects file" source, as shown in the following example:
     [0.065s][info][class,load] org.springframework.context.MessageSource source: shared objects file (top)
 ----
 
-TIP: If you have a large number of classes that are not loaded from the cache, make sure that
-the JDK and classpath used by the commands that create the archive and start the application
-are identical. Note also that to effectively cache classes, the classpath should be specified
-as a list of JARs containing those classes, and avoid the usage of directories and `*`
-wildcard characters.
+If CDS can't be enabled or if you have a large number of classes that are not loaded from the cache, make sure that
+the following conditions are fulfilled when creating and using the archive:
+
+ - The very same JVM must used.
+ - The classpath must be specified as a list of JARs, and avoid the usage of directories and `*` wildcard characters.
+ - The timestamps of the JARs must be preserved.
+ - When using the archive, the classpath must be the same than the one used to create the archive, in the same order.
+Additional JARs or directories can be specified *at the end* (but won't be cached).

framework-docs/modules/ROOT/pages/integration/email.adoc

@@ -85,7 +85,7 @@ email when someone places an order:
 
 			// Call the collaborators to persist the order...
 
-			// Create a thread safe "copy" of the template message and customize it
+			// Create a thread-safe "copy" of the template message and customize it
 			SimpleMailMessage msg = new SimpleMailMessage(this.templateMessage);
 			msg.setTo(order.getCustomer().getEmailAddress());
 			msg.setText(

framework-docs/modules/ROOT/pages/integration/jms/annotated.adoc

@@ -58,7 +58,7 @@ your `@Configuration` classes, as the following example shows:
 By default, the infrastructure looks for a bean named `jmsListenerContainerFactory`
 as the source for the factory to use to create message listener containers. In this
 case (and ignoring the JMS infrastructure setup), you can invoke the `processOrder`
-method with a core poll size of three threads and a maximum pool size of ten threads.
+method with a core pool size of three threads and a maximum pool size of ten threads.
 
 You can customize the listener container factory to use for each annotation or you can
 configure an explicit default by implementing the `JmsListenerConfigurer` interface.

framework-docs/modules/ROOT/pages/integration/observability.adoc

@@ -108,7 +108,7 @@ By default, the following `KeyValues` are created:
 |===
 |Name | Description
 |`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.
+|`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.
 |`outcome` _(required)_|Outcome of the method execution. Can be `"SUCCESS"`, `"ERROR"` or `"UNKNOWN"` (if for example the operation was cancelled during execution).

framework-docs/modules/ROOT/pages/integration/rest-clients.adoc

@@ -13,12 +13,12 @@ The Spring Framework provides the following choices for making calls to REST end
 == `RestClient`
 
 The `RestClient` is a synchronous HTTP client that offers a modern, fluent API.
-It offers an abstraction over HTTP libraries that allows for convenient conversion from Java object to HTTP request, and creation of objects from the HTTP response.
+It offers an abstraction over HTTP libraries that allows for convenient conversion from a Java object to an HTTP request, and the creation of objects from an HTTP response.
 
 === Creating a `RestClient`
 
 The `RestClient` is created using one of the static `create` methods.
-You can also use `builder` to get a builder with further options, such as specifying which HTTP library to use (see <<rest-request-factories>>) and which message converters to use (see <<rest-message-conversion>>), setting a default URI, default path variables, a default request headers, or `uriBuilderFactory`, or registering interceptors and initializers.
+You can also use `builder()` to get a builder with further options, such as specifying which HTTP library to use (see <<rest-request-factories>>) and which message converters to use (see <<rest-message-conversion>>), setting a default URI, default path variables, default request headers, or `uriBuilderFactory`, or registering interceptors and initializers.
 
 Once created (or built), the `RestClient` can be used safely by multiple threads.
 
@@ -51,9 +51,9 @@ val defaultClient = RestClient.create()
 
 val customClient = RestClient.builder()
   .requestFactory(HttpComponentsClientHttpRequestFactory())
-  .messageConverters(converters -> converters.add(MyCustomMessageConverter()))
+  .messageConverters { converters -> converters.add(MyCustomMessageConverter()) }
   .baseUrl("https://example.com")
-  .defaultUriVariables(Map.of("variable", "foo"))
+  .defaultUriVariables(mapOf("variable" to "foo"))
   .defaultHeader("My-Header", "Foo")
   .requestInterceptor(myCustomInterceptor)
   .requestInitializer(myCustomInitializer)
@@ -64,35 +64,62 @@ val customClient = RestClient.builder()
 === Using the `RestClient`
 
 When making an HTTP request with the `RestClient`, the first thing to specify is which HTTP method to use.
-This can be done with `method(HttpMethod)`, or with the convenience methods `get()`, `head()`, `post()`, and so on.
+This can be done with `method(HttpMethod)` or with the convenience methods `get()`, `head()`, `post()`, and so on.
 
 ==== Request URL
 
 Next, the request URI can be specified with the `uri` methods.
-This step is optional, and can be skipped if the `RestClient` is configured with a default URI.
-The URL is typically specified as `String`, with optional URI template variables.
-String URLs are encoded by default, but this can be changed by building a client with a custom `uriBuilderFactory`.
+This step is optional and can be skipped if the `RestClient` is configured with a default URI.
+The URL is typically specified as a `String`, with optional URI template variables.
+The following example configures a GET request to `https://example.com/orders/42`:
 
-The URL can also be provided with a function, or as `java.net.URI`, both of which are not encoded.
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+int id = 42;
+restClient.get()
+  .uri("https://example.com/orders/{id}", id)
+  ....
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+val id = 42
+restClient.get()
+  .uri("https://example.com/orders/{id}", id)
+  ...
+----
+======
+
+A function can also be used for more controls, such as specifying xref:web/webmvc/mvc-uri-building.adoc[request parameters].
+
+String URLs are encoded by default, but this can be changed by building a client with a custom `uriBuilderFactory`.
+The URL can also be provided with a function or as a `java.net.URI`, both of which are not encoded.
 For more details on working with and encoding URIs, see xref:web/webmvc/mvc-uri-building.adoc[URI Links].
 
 ==== Request headers and body
 
-If necessary, the HTTP request can be manipulated, by adding request headers with `header(String, String)`, `headers(Consumer<HttpHeaders>`, or with the convenience methods `accept(MediaType...)`, `acceptCharset(Charset...)` and so on.
-For HTTP request that can contain a body (`POST`, `PUT`, and `PATCH`), additional methods are available: `contentType(MediaType)`, and `contentLength(long)`.
+If necessary, the HTTP request can be manipulated by adding request headers with `header(String, String)`, `headers(Consumer<HttpHeaders>`, or with the convenience methods `accept(MediaType...)`, `acceptCharset(Charset...)` and so on.
+For HTTP requests that can contain a body (`POST`, `PUT`, and `PATCH`), additional methods are available: `contentType(MediaType)`, and `contentLength(long)`.
 
 The request body itself can be set by `body(Object)`, which internally uses <<rest-message-conversion>>.
 Alternatively, the request body can be set using a `ParameterizedTypeReference`, allowing you to use generics.
 Finally, the body can be set to a callback function that writes to an `OutputStream`.
 
 ==== Retrieving the response
+
 Once the request has been set up, the HTTP response is accessed by invoking `retrieve()`.
-The response body can be accessed by using `body(Class)`, or `body(ParameterizedTypeReference)` for parameterized types like lists.
-The `body` method converts the response contents into various types, for instance bytes can be converted into a `String`, JSON into objects using Jackson, and so on (see <<rest-message-conversion>>).
+The response body can be accessed by using `body(Class)` or `body(ParameterizedTypeReference)` for parameterized types like lists.
+The `body` method converts the response contents into various types – for instance, bytes can be converted into a `String`, JSON can be converted into objects using Jackson, and so on (see <<rest-message-conversion>>).
 
 The response can also be converted into a `ResponseEntity`, giving access to the response headers as well as the body.
 
-This sample shows how `RestClient` can be used to perform a simple GET request.
+This sample shows how `RestClient` can be used to perform a simple `GET` request.
 
 [tabs]
 ======
@@ -171,7 +198,7 @@ println("Contents: " + result.body) <3>
 ======
 
 `RestClient` can convert JSON to objects, using the Jackson library.
-Note the usage of uri variables in this sample, and that the `Accept` header is set to JSON.
+Note the usage of URI variables in this sample and that the `Accept` header is set to JSON.
 
 [tabs]
 ======
@@ -248,8 +275,9 @@ val response = restClient.post() <2>
 ======
 
 ==== Error handling
+
 By default, `RestClient` throws a subclass of `RestClientException` when retrieving a response with a 4xx or 5xx status code.
-This behavior can be overriden using `onStatus`.
+This behavior can be overridden using `onStatus`.
 
 [tabs]
 ======
@@ -286,8 +314,9 @@ val result = restClient.get() <1>
 ======
 
 ==== Exchange
-For more advanced scenarios, the `RestClient` gives access to the underlying HTTP request and response through the `exchange` method, which can be used instead of `retrieve()`.
-Status handlers are not applied when you exchange, because the exchange function already provides access to the full response, allowing you to perform any error handling necessary.
+
+For more advanced scenarios, the `RestClient` gives access to the underlying HTTP request and response through the `exchange()` method, which can be used instead of `retrieve()`.
+Status handlers are not applied when use `exchange()`, because the exchange function already provides access to the full response, allowing you to perform any error handling necessary.
 
 [tabs]
 ======
@@ -336,6 +365,7 @@ val result = restClient.get()
 
 [[rest-message-conversion]]
 === HTTP Message Conversion
+
 [.small]#xref:web/webflux/reactive-spring.adoc#webflux-codecs[See equivalent in the Reactive stack]#
 
 The `spring-web` module contains the `HttpMessageConverter` interface for reading and writing the body of HTTP requests and responses through `InputStream` and `OutputStream`.
@@ -397,7 +427,7 @@ By default, this converter supports `text/xml` and `application/xml`.
 |===
 
 By default, `RestClient` and `RestTemplate` register all built-in message converters, depending on the availability of underlying libraries on the classpath.
-You can also set the message converters to use explicitly, by using `messageConverters` on the `RestClient` builder, or via the `messageConverters` property of `RestTemplate`.
+You can also set the message converters to use explicitly, by using the `messageConverters()` method on the `RestClient` builder, or via the `messageConverters` property of `RestTemplate`.
 
 ==== Jackson JSON Views
 
@@ -437,13 +467,13 @@ parts.add("xmlPart", new HttpEntity<>(myBean, headers));
 ----
 
 In most cases, you do not have to specify the `Content-Type` for each part.
-The content type is determined automatically based on the `HttpMessageConverter` chosen to serialize it or, in the case of a `Resource` based on the file extension.
+The content type is determined automatically based on the `HttpMessageConverter` chosen to serialize it or, in the case of a `Resource`, based on the file extension.
 If necessary, you can explicitly provide the `MediaType` with an `HttpEntity` wrapper.
 
-Once the `MultiValueMap` is ready, you can use it as the body of a POST request, using  `RestClient.post().body(parts)` (or `RestTemplate.postForObject`).
+Once the `MultiValueMap` is ready, you can use it as the body of a `POST` request, using  `RestClient.post().body(parts)` (or `RestTemplate.postForObject`).
 
 If the `MultiValueMap` contains at least one non-`String` value, the `Content-Type` is set to `multipart/form-data` by the `FormHttpMessageConverter`.
-If the `MultiValueMap` has `String` values the `Content-Type` defaults to `application/x-www-form-urlencoded`.
+If the `MultiValueMap` has `String` values, the `Content-Type` defaults to `application/x-www-form-urlencoded`.
 If necessary the `Content-Type` may also be set explicitly.
 
 [[rest-request-factories]]
@@ -453,17 +483,20 @@ To execute the HTTP request, `RestClient` uses a client HTTP library.
 These libraries are adapted via the `ClientRequestFactory` interface.
 Various implementations are available:
 
-* `JdkClientHttpRequestFactory` for Java's `HttpClient`,
-* `HttpComponentsClientHttpRequestFactory` for use with Apache HTTP Components `HttpClient`,
-* `JettyClientHttpRequestFactory` for Jetty's `HttpClient`,
-* `ReactorNettyClientRequestFactory` for Reactor Netty's `HttpClient`,
-* `SimpleClientHttpRequestFactory` as a simple default.
+* `JdkClientHttpRequestFactory` for Java's `HttpClient`
+* `HttpComponentsClientHttpRequestFactory` for use with Apache HTTP Components `HttpClient`
+* `JettyClientHttpRequestFactory` for Jetty's `HttpClient`
+* `ReactorNettyClientRequestFactory` for Reactor Netty's `HttpClient`
+* `SimpleClientHttpRequestFactory` as a simple default
 
 
 If no request factory is specified when the `RestClient` was built, it will use the Apache or Jetty `HttpClient` if they are available on the classpath.
 Otherwise, if the `java.net.http` module is loaded, it will use Java's `HttpClient`.
 Finally, it will resort to the simple default.
 
+TIP: Note that the `SimpleClientHttpRequestFactory` may raise an exception when accessing the status of a response that represents an error (e.g. 401).
+If this is an issue, use any of the alternative request factories.
+
 [[rest-webclient]]
 == `WebClient`
 
@@ -473,12 +506,12 @@ synchronous, asynchronous, and streaming scenarios.
 
 `WebClient` supports the following:
 
-* Non-blocking I/O.
-* Reactive Streams back pressure.
-* High concurrency with fewer hardware resources.
-* Functional-style, fluent API that takes advantage of Java 8 lambdas.
-* Synchronous and asynchronous interactions.
-* Streaming up to or streaming down from a server.
+* Non-blocking I/O
+* Reactive Streams back pressure
+* High concurrency with fewer hardware resources
+* Functional-style, fluent API that takes advantage of Java 8 lambdas
+* Synchronous and asynchronous interactions
+* Streaming up to or streaming down from a server
 
 See xref:web/webflux-webclient.adoc[WebClient] for more details.
 
@@ -848,17 +881,17 @@ It can be used to migrate from the latter to the former.
 .toEntity(ParameterizedTypeReference)` footnote:request-entity[]
 
 
-| `execute(String, HttpMethod method, RequestCallback, ResponseExtractor, Object...)`
+| `execute(String, HttpMethod, RequestCallback, ResponseExtractor, Object...)`
 | `method(HttpMethod)
 .uri(String, Object...)
 .exchange(ExchangeFunction)`
 
-| `execute(String, HttpMethod method, RequestCallback, ResponseExtractor, Map)`
+| `execute(String, HttpMethod, RequestCallback, ResponseExtractor, Map)`
 | `method(HttpMethod)
 .uri(String, Map)
 .exchange(ExchangeFunction)`
 
-| `execute(URI, HttpMethod method, RequestCallback, ResponseExtractor)`
+| `execute(URI, HttpMethod, RequestCallback, ResponseExtractor)`
 | `method(HttpMethod)
 .uri(URI)
 .exchange(ExchangeFunction)`
@@ -906,8 +939,8 @@ For `WebClient`:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
-	WebClient client = WebClient.builder().baseUrl("https://api.github.com/").build();
-	WebClientAdapter adapter = WebClientAdapter.forClient(webClient)
+	WebClient webClient = WebClient.builder().baseUrl("https://api.github.com/").build();
+	WebClientAdapter adapter = WebClientAdapter.create(webClient);
 	HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(adapter).build();
 
 	RepositoryService service = factory.createClient(RepositoryService.class);
@@ -973,6 +1006,9 @@ method parameters:
   `Map<String, ?>` with multiple variables, or an individual value. Type conversion
   is supported for non-String values.
 
+| `@RequestAttribute`
+| Provide an `Object` to add as a request attribute. Only supported by `WebClient`.
+
 | `@RequestBody`
 | Provide the body of the request either as an Object to be serialized, or a
   Reactive Streams `Publisher` such as `Mono`, `Flux`, or any other async type supported
@@ -1078,11 +1114,34 @@ underlying HTTP client, which operates at a lower level and provides more contro
 
 
 [[rest-http-interface-exceptions]]
-=== Exception Handling
+=== Error Handling
 
-By default, `WebClient` raises `WebClientResponseException` for 4xx and 5xx HTTP status
-codes. To customize this, you can register a response status handler that applies to all
-responses performed through the client:
+To customize error response handling, you need to configure the underlying HTTP client.
+
+For `RestClient`:
+
+By default, `RestClient` raises `RestClientException` for 4xx and 5xx HTTP status codes.
+To customize this, register a response status handler that applies to all responses
+performed through the client:
+
+[source,java,indent=0,subs="verbatim,quotes"]
+----
+	RestClient restClient = RestClient.builder()
+			.defaultStatusHandler(HttpStatusCode::isError, (request, response) -> ...)
+			.build();
+
+	RestClientAdapter adapter = RestClientAdapter.create(restClient);
+	HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(adapter).build();
+----
+
+For more details and options, such as suppressing error status codes, see the Javadoc of
+`defaultStatusHandler` in `RestClient.Builder`.
+
+For `WebClient`:
+
+By default, `WebClient` raises `WebClientResponseException` for 4xx and 5xx HTTP status codes.
+To customize this, register a response status handler that applies to all responses
+performed through the client:
 
 [source,java,indent=0,subs="verbatim,quotes"]
 ----
@@ -1090,10 +1149,28 @@ responses performed through the client:
 			.defaultStatusHandler(HttpStatusCode::isError, resp -> ...)
 			.build();
 
-	WebClientAdapter clientAdapter = WebClientAdapter.forClient(webClient);
-	HttpServiceProxyFactory factory = HttpServiceProxyFactory
-			.builder(clientAdapter).build();
+	WebClientAdapter adapter = WebClientAdapter.create(webClient);
+	HttpServiceProxyFactory factory = HttpServiceProxyFactory.builder(adapter).build();
 ----
 
 For more details and options, such as suppressing error status codes, see the Javadoc of
 `defaultStatusHandler` in `WebClient.Builder`.
+
+For `RestTemplate`:
+
+By default, `RestTemplate` raises `RestClientException` for 4xx and 5xx HTTP status codes.
+To customize this, register an error handler that applies to all responses
+performed through the client:
+
+[source,java,indent=0,subs="verbatim,quotes"]
+----
+    RestTemplate restTemplate = new RestTemplate();
+    restTemplate.setErrorHandler(myErrorHandler);
+
+    RestTemplateAdapter adapter = RestTemplateAdapter.create(restTemplate);
+    HttpServiceProxyFactory factory = HttpServiceProxyFactory.builderFor(adapter).build();
+----
+
+For more details and options, see the Javadoc of `setErrorHandler` in `RestTemplate` and
+the `ResponseErrorHandler` hierarchy.
+

framework-docs/modules/ROOT/pages/integration/scheduling.adoc

@@ -252,7 +252,9 @@ application server environments, as well -- in particular on Tomcat and Jetty.
 As of 6.1, `ThreadPoolTaskScheduler` provides a pause/resume capability and graceful
 shutdown through Spring's lifecycle management. There is also a new option called
 `SimpleAsyncTaskScheduler` which is aligned with JDK 21's Virtual Threads, using a
-single scheduler thread but firing up a new thread for every scheduled task execution.
+single scheduler thread but firing up a new thread for every scheduled task execution
+(except for fixed-delay tasks which all operate on a single scheduler thread, so for
+this virtual-thread-aligned option, fixed rates and cron triggers are recommended).
 
 
 
@@ -477,12 +479,12 @@ the framework to invoke a suspending function as a `Publisher`.
 
 The Spring Framework will obtain a `Publisher` for the annotated method once and will
 schedule a `Runnable` in which it subscribes to said `Publisher`. These inner regular
-subscriptions occur according to the corresponding `cron`/fixedDelay`/`fixedRate` configuration.
+subscriptions occur according to the corresponding `cron`/`fixedDelay`/`fixedRate` configuration.
 
 If the `Publisher` emits `onNext` signal(s), these are ignored and discarded (the same way
 return values from synchronous `@Scheduled` methods are ignored).
 
-In the following example, the `Flux` emits `onNext("Hello"), onNext("World")` every 5
+In the following example, the `Flux` emits `onNext("Hello")`, `onNext("World")` every 5
 seconds, but these values are unused:
 
 [source,java,indent=0,subs="verbatim,quotes"]

framework-docs/modules/ROOT/pages/languages/groovy.adoc

@@ -8,7 +8,7 @@ existing Java application.
 
 The Spring Framework provides a dedicated `ApplicationContext` that supports a Groovy-based
 Bean Definition DSL. For more details, see
-xref:core/beans/basics.adoc#groovy-bean-definition-dsl[The Groovy Bean Definition DSL].
+xref:core/beans/basics.adoc#beans-factory-groovy[The Groovy Bean Definition DSL].
 
 Further support for Groovy, including beans written in Groovy, refreshable script beans,
 and more is available in xref:languages/dynamic.adoc[Dynamic Language Support].

framework-docs/modules/ROOT/pages/languages/kotlin.adoc

@@ -13,7 +13,7 @@ Most of the code samples of the reference documentation are
 provided in Kotlin in addition to Java.
 
 The easiest way to build a Spring application with Kotlin is to leverage Spring Boot and
-its{spring-boot-docs}/boot-features-kotlin.html[dedicated Kotlin support].
+its {spring-boot-docs}/boot-features-kotlin.html[dedicated Kotlin support].
 {spring-site-guides}/tutorials/spring-boot-kotlin/[This comprehensive tutorial]
 will teach you how to build Spring Boot applications with Kotlin using https://start.spring.io/#!language=kotlin&type=gradle-project[start.spring.io].
 

framework-docs/modules/ROOT/pages/languages/kotlin/bean-definition-dsl.adoc

@@ -107,7 +107,7 @@ NOTE: Spring Boot is based on JavaConfig and
 {spring-boot-issues}/8115[does not yet provide specific support for functional bean definition],
 but you can experimentally use functional bean definitions through Spring Boot's `ApplicationContextInitializer` support.
 See {stackoverflow-questions}/45935931/how-to-use-functional-bean-definition-kotlin-dsl-with-spring-boot-and-spring-w/46033685#46033685[this Stack Overflow answer]
-for more details and up-to-date information. See also the experimental Kofu DSL developed in {spring-github-org}/spring-fu[Spring Fu incubator].
+for more details and up-to-date information. See also the experimental Kofu DSL developed in {spring-github-org}-experimental/spring-fu[Spring Fu incubator].
 
 
 

framework-docs/modules/ROOT/pages/languages/kotlin/coroutines.adoc

@@ -14,8 +14,10 @@ Spring Framework provides support for Coroutines on the following scope:
 * Suspending function support in Spring MVC and WebFlux annotated `@Controller`
 * Extensions for WebFlux {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.client/index.html[client] and {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/index.html[server] functional API.
 * WebFlux.fn {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/co-router.html[coRouter { }] DSL
+* WebFlux {spring-framework-api-kdoc}/spring-web/org.springframework.web.server/-co-web-filter/index.html[`CoWebFilter`]
 * Suspending function and `Flow` support in RSocket `@MessageMapping` annotated methods
 * Extensions for {spring-framework-api-kdoc}/spring-messaging/org.springframework.messaging.rsocket/index.html[`RSocketRequester`]
+* Spring AOP
 
 
 

framework-docs/modules/ROOT/pages/languages/kotlin/getting-started.adoc

@@ -10,22 +10,21 @@ The easiest way to learn how to build a Spring application with Kotlin is to fol
 == `start.spring.io`
 
 The easiest way to start a new Spring Framework project in Kotlin is to create a new Spring
-Boot 2 project on https://start.spring.io/#!language=kotlin&type=gradle-project[start.spring.io].
+Boot project on https://start.spring.io/#!language=kotlin&type=gradle-project-kotlin[start.spring.io].
 
 
 
 [[choosing-the-web-flavor]]
 == Choosing the Web Flavor
 
-Spring Framework now comes with two different web stacks: xref:web/webmvc.adoc#mvc[Spring MVC] and
+Spring Framework comes with two different web stacks: xref:web/webmvc.adoc#mvc[Spring MVC] and
 xref:testing/unit.adoc#mock-objects-web-reactive[Spring WebFlux].
 
 Spring WebFlux is recommended if you want to create applications that will deal with latency,
-long-lived connections, streaming scenarios or if you want to use the web functional
-Kotlin DSL.
+long-lived connections or streaming scenarios.
 
 For other use cases, especially if you are using blocking technologies such as JPA, Spring
-MVC and its annotation-based programming model is the recommended choice.
+MVC is the recommended choice.
 
 
 

framework-docs/modules/ROOT/pages/languages/kotlin/requirements.adoc

@@ -2,15 +2,12 @@
 = Requirements
 :page-section-summary-toc: 1
 
-Spring Framework supports Kotlin 1.3+ and requires
+Spring Framework supports Kotlin 1.7+ and requires
 https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-stdlib[`kotlin-stdlib`]
-(or one of its variants, such as https://search.maven.org/artifact/org.jetbrains.kotlin/kotlin-stdlib-jdk8[`kotlin-stdlib-jdk8`])
 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
 https://start.spring.io/#!language=kotlin&type=gradle-project[start.spring.io].
 
-WARNING: Kotlin {kotlin-docs}/inline-classes.html[inline classes] are not yet supported.
-
 NOTE: The {jackson-github-org}/jackson-module-kotlin[Jackson Kotlin module] is required
 for serializing or deserializing JSON data for Kotlin classes with Jackson, so make sure to add the
 `com.fasterxml.jackson.module:jackson-module-kotlin` dependency to your project if you have such need.

framework-docs/modules/ROOT/pages/languages/kotlin/resources.adoc

@@ -18,28 +18,9 @@ Kotlin and the Spring Framework:
 
 The following Github projects offer examples that you can learn from and possibly even extend:
 
+* https://github.com/spring-guides/tut-spring-boot-kotlin[tut-spring-boot-kotlin]: Sources of {spring-site}/guides/tutorials/spring-boot-kotlin/[the official Spring + Kotlin tutorial]
 * https://github.com/sdeleuze/spring-boot-kotlin-demo[spring-boot-kotlin-demo]: Regular Spring Boot and Spring Data JPA project
-* https://github.com/mixitconf/mixit[mixit]: Spring Boot 2, WebFlux, and Reactive Spring Data MongoDB
+* https://github.com/mixitconf/mixit[mixit]: Spring Boot, WebFlux, and Reactive Spring Data MongoDB
 * https://github.com/sdeleuze/spring-kotlin-functional[spring-kotlin-functional]: Standalone WebFlux and functional bean definition DSL
 * https://github.com/sdeleuze/spring-kotlin-fullstack[spring-kotlin-fullstack]: WebFlux Kotlin fullstack example with Kotlin2js for frontend instead of JavaScript or TypeScript
 * https://github.com/spring-petclinic/spring-petclinic-kotlin[spring-petclinic-kotlin]: Kotlin version of the Spring PetClinic Sample Application
-* https://github.com/sdeleuze/spring-kotlin-deepdive[spring-kotlin-deepdive]: A step-by-step migration guide for Boot 1.0 and Java to Boot 2.0 and Kotlin
-* https://github.com/spring-cloud/spring-cloud-gcp/tree/master/spring-cloud-gcp-kotlin-samples/spring-cloud-gcp-kotlin-app-sample[spring-cloud-gcp-kotlin-app-sample]: Spring Boot with Google Cloud Platform Integrations
-
-
-
-[[issues]]
-== Issues
-
-The following list categorizes the pending issues related to Spring and Kotlin support:
-
-* Spring Framework
-** {spring-framework-issues}/20606[Unable to use WebTestClient with mock server in Kotlin]
-** {spring-framework-issues}/20496[Support null-safety at generics, varargs and array elements level]
-* Kotlin
-** {kotlin-issues}/KT-6380[Parent issue for Spring Framework support]
-** {kotlin-issues}/KT-5464[Kotlin requires type inference where Java doesn't]
-** {kotlin-issues}/KT-20283[Smart cast regression with open classes]
-** {kotlin-issues}/KT-14984[Impossible to pass not all SAM argument as function]
-** {kotlin-issues}/KT-15125[Support JSR 223 bindings directly via script variables]
-** {kotlin-issues}/KT-6653[Kotlin properties do not override Java-style getters and setters]

framework-docs/modules/ROOT/pages/languages/kotlin/spring-projects-in.adoc

@@ -9,7 +9,7 @@ in Kotlin.
 [[final-by-default]]
 == Final by Default
 
-By default, https://discuss.kotlinlang.org/t/classes-final-by-default/166[all classes in Kotlin are `final`].
+By default, https://discuss.kotlinlang.org/t/classes-final-by-default/166[all classes and member functions in Kotlin are `final`].
 The `open` modifier on a class is the opposite of Java's `final`: It allows others to inherit from this
 class. This also applies to member functions, in that they need to be marked as `open` to be overridden.
 
@@ -38,6 +38,12 @@ Meta-annotation support means that types annotated with `@Configuration`, `@Cont
 `@RestController`, `@Service`, or `@Repository` are automatically opened since these
 annotations are meta-annotated with `@Component`.
 
+WARNING: Some use cases involving proxies and automatic generation of final methods by the Kotlin compiler require extra
+care. For example, a Kotlin class with properties will generate related `final` getters and setters. In order
+to be able to proxy related methods, a type level `@Component` annotation should be preferred to method level `@Bean` in
+order to have those methods opened by the `kotlin-spring` plugin. A typical use case is `@Scope` and its popular
+`@RequestScope` specialization.
+
 https://start.spring.io/#!language=kotlin&type=gradle-project[start.spring.io] enables
 the `kotlin-spring` plugin by default. So, in practice, you can write your Kotlin beans
 without any additional `open` keyword, as in Java.
@@ -97,6 +103,9 @@ does not require the `kotlin-noarg` plugin if the module uses Spring Data object
 [[injecting-dependencies]]
 == Injecting Dependencies
 
+[[favor-constructor-injection]]
+=== Favor constructor injection
+
 Our recommendation is to try to favor constructor injection with `val` read-only (and
 non-nullable when possible) {kotlin-docs}/properties.html[properties],
 as the following example shows:
@@ -130,7 +139,41 @@ as the following example shows:
 	}
 ----
 
+[[internal-functions-name-mangling]]
+=== Internal functions name mangling
 
+Kotlin functions with the `internal` {kotlin-docs}/visibility-modifiers.html#class-members[visibility modifier] have
+their names mangled when compiled to JVM bytecode, which has a side effect when injecting dependencies by name.
+
+For example, this Kotlin class:
+[source,kotlin,indent=0]
+----
+@Configuration
+class SampleConfiguration {
+
+	@Bean
+	internal fun sampleBean() = SampleBean()
+}
+----
+
+Translates to this Java representation of the compiled JVM bytecode:
+[source,java,indent=0]
+----
+@Configuration
+@Metadata(/* ... */)
+public class SampleConfiguration {
+
+	@Bean
+	@NotNull
+	public SampleBean sampleBean$demo_kotlin_internal_test() {
+		return new SampleBean();
+	}
+}
+----
+
+As a consequence, the related bean name represented as a Kotlin string is `"sampleBean\$demo_kotlin_internal_test"`,
+instead of `"sampleBean"` for the regular `public` function use-case. Make sure to use the mangled name when injecting
+such bean by name, or add `@JvmName("sampleBean")` to disable name mangling.
 
 [[injecting-configuration-properties]]
 == Injecting Configuration Properties

framework-docs/modules/ROOT/pages/languages/kotlin/web.adoc

@@ -8,9 +8,9 @@
 
 Spring Framework comes with a Kotlin router DSL available in 3 flavors:
 
-* WebMvc.fn DSL with {spring-framework-api-kdoc}/spring-webmvc/org.springframework.web.servlet.function/router.html[router { }]
-* WebFlux.fn <<web-reactive#webflux-fn, Reactive>> DSL with {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/router.html[router { }]
-* WebFlux.fn <<Coroutines>> DSL with {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/co-router.html[coRouter { }]
+* xref:web/webmvc-functional.adoc[WebMvc.fn DSL] with {spring-framework-api-kdoc}/spring-webmvc/org.springframework.web.servlet.function/router.html[router { }]
+* xref:web/webflux-functional.adoc[WebFlux.fn Reactive DSL] with {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/router.html[router { }]
+* xref:languages/kotlin/coroutines.adoc[WebFlux.fn Coroutines DSL] with {spring-framework-api-kdoc}/spring-webflux/org.springframework.web.reactive.function.server/co-router.html[coRouter { }]
 
 These DSL let you write clean and idiomatic Kotlin code to build a `RouterFunction` instance as the following example shows:
 
@@ -126,7 +126,7 @@ project for more details.
 [[kotlin-multiplatform-serialization]]
 == Kotlin multiplatform serialization
 
-As of Spring Framework 5.3, {kotlin-github-org}/kotlinx.serialization[Kotlin multiplatform serialization] is
+{kotlin-github-org}/kotlinx.serialization[Kotlin multiplatform serialization] is
 supported in Spring MVC, Spring WebFlux and Spring Messaging (RSocket). The builtin support currently targets CBOR, JSON, and ProtoBuf formats.
 
 To enable it, follow {kotlin-github-org}/kotlinx.serialization#setup[those instructions] to add the related dependency and plugin.

framework-docs/modules/ROOT/pages/testing/spring-mvc-test-framework/server-setup-options.adoc

@@ -111,7 +111,8 @@ a mock service with Mockito:
 [source,xml,indent=0,subs="verbatim,quotes"]
 ----
 	<bean id="accountService" class="org.mockito.Mockito" factory-method="mock">
-		<constructor-arg value="org.example.AccountService"/>
+		<constructor-arg type="java.lang.Class" value="org.example.AccountService"/>
+		<constructor-arg type="java.lang.String" value="accountService"/>
 	</bean>
 ----
 
@@ -152,7 +153,7 @@ Kotlin::
 		@Autowired
 		lateinit var accountService: AccountService
 
-		lateinit mockMvc: MockMvc
+		lateinit var mockMvc: MockMvc
 
 		@BeforeEach
 		fun setup(wac: WebApplicationContext) {

framework-docs/modules/ROOT/pages/testing/spring-mvc-test-framework/vs-end-to-end-integration-tests.adoc

@@ -1,7 +1,7 @@
 [[spring-mvc-test-vs-end-to-end-integration-tests]]
 = MockMvc vs End-to-End Tests
 
-MockMVc is built on Servlet API mock implementations from the
+MockMvc is built on Servlet API mock implementations from the
 `spring-test` module and does not rely on a running container. Therefore, there are
 some differences when compared to full end-to-end integration tests with an actual
 client and a live server running.

framework-docs/modules/ROOT/pages/testing/spring-mvc-test-framework/vs-streaming-response.adoc

@@ -1,38 +1,16 @@
 [[spring-mvc-test-vs-streaming-response]]
 = Streaming Responses
 
-The best way to test streaming responses such as Server-Sent Events is through the
-<<WebTestClient>> which can be used as a test client to connect to a `MockMvc` instance
-to perform tests on Spring MVC controllers without a running server. For example:
+You can use `WebTestClient` to test xref:testing/webtestclient.adoc#webtestclient-stream[streaming responses]
+such as Server-Sent Events. However, `MockMvcWebTestClient` doesn't support infinite
+streams because there is no way to cancel the server stream from the client side.
+To test infinite streams, you'll need to
+xref:testing/webtestclient.adoc#webtestclient-server-config[bind to] a running server,
+or when using Spring Boot,
+{spring-boot-docs}/spring-boot-features.html#boot-features-testing-spring-boot-applications-testing-with-running-server[test with a running server].
 
-[tabs]
-======
-Java::
-+
-[source,java,indent=0,subs="verbatim,quotes",role="primary"]
-----
-	WebTestClient client = MockMvcWebTestClient.bindToController(new SseController()).build();
-
-	FluxExchangeResult<Person> exchangeResult = client.get()
-			.uri("/persons")
-			.exchange()
-			.expectStatus().isOk()
-			.expectHeader().contentType("text/event-stream")
-			.returnResult(Person.class);
-
-	// Use StepVerifier from Project Reactor to test the streaming response
-
-	StepVerifier.create(exchangeResult.getResponseBody())
-			.expectNext(new Person("N0"), new Person("N1"), new Person("N2"))
-			.expectNextCount(4)
-			.consumeNextWith(person -> assertThat(person.getName()).endsWith("7"))
-			.thenCancel()
-			.verify();
-----
-======
-
-`WebTestClient` can also connect to a live server and perform full end-to-end integration
-tests. This is also supported in Spring Boot where you can
-{spring-boot-docs}/spring-boot-features.html#boot-features-testing-spring-boot-applications-testing-with-running-server[test a running server].
+`MockMvcWebTestClient` does support asynchronous responses, and even streaming responses.
+The limitation is that it can't influence the server to stop, and therefore the server
+must finish writing the response on its own.
 
 

framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/groovy.adoc

@@ -2,7 +2,7 @@
 = Context Configuration with Groovy Scripts
 
 To load an `ApplicationContext` for your tests by using Groovy scripts that use the
-xref:core/beans/basics.adoc#groovy-bean-definition-dsl[Groovy Bean Definition DSL], you can annotate
+xref:core/beans/basics.adoc#beans-factory-groovy[Groovy Bean Definition DSL], you can annotate
 your test class with `@ContextConfiguration` and configure the `locations` or `value`
 attribute with an array that contains the resource locations of Groovy scripts. Resource
 lookup semantics for Groovy scripts are the same as those described for

framework-docs/modules/ROOT/pages/testing/webtestclient.adoc

@@ -672,13 +672,13 @@ Kotlin::
 	val result = client.get().uri("/persons/1")
 			.exchange()
 			.expectStatus().isOk()
-			.expectBody(Person.class)
-			.returnResult();
+			.expectBody<Person>()
+			.returnResult()
 
 	// For a response without a body
 	val result = client.get().uri("/path")
 			.exchange()
-			.expectBody().isEmpty();
+			.expectBody().isEmpty()
 ----
 ======
 

framework-docs/modules/ROOT/pages/web/webflux-functional.adoc

@@ -782,6 +782,73 @@ Kotlin::
 ======
 
 
+[[webflux-fn-serving-resources]]
+== Serving Resources
+
+WebFlux.fn provides built-in support for serving resources.
+
+NOTE: In addition to the capabilities described below, it is possible to implement even more flexible resource handling thanks to
+{spring-framework-api}++/web/reactive/function/server/RouterFunctions.html#resources(java.util.function.Function)++[`RouterFunctions#resource(java.util.function.Function)`].
+
+[[webflux-fn-resource]]
+=== Redirecting to a resource
+
+It is possible to redirect requests matching a specified predicate to a resource. This can be useful, for example,
+for handling redirects in Single Page Applications.
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+	ClassPathResource index = new ClassPathResource("static/index.html");
+	List<String> extensions = Arrays.asList("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();
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+	val redirectToIndex = router {
+		val index = ClassPathResource("static/index.html")
+		val extensions = listOf("js", "css", "ico", "png", "jpg", "gif")
+		val spaPredicate = !(path("/api/**") or path("/error") or
+			pathExtension(extensions::contains))
+		resource(spaPredicate, index)
+	}
+----
+======
+
+[[webflux-fn-resources]]
+=== Serving resources from a root location
+
+It is also possible to route requests that match a given pattern to resources relative to a given root location.
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+    Resource location = new FileSystemResource("public-resources/");
+    RouterFunction<ServerResponse> resources = RouterFunctions.resources("/resources/**", location);
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+    val location = FileSystemResource("public-resources/")
+    val resources = router { resources("/resources/**", location) }
+----
+======
+
+
 [[webflux-fn-running]]
 == Running a Server
 [.small]#xref:web/webmvc-functional.adoc#webmvc-fn-running[See equivalent in the Servlet stack]#

framework-docs/modules/ROOT/pages/web/webflux-reactive-libraries.adoc

@@ -4,10 +4,13 @@
 `spring-webflux` depends on `reactor-core` and uses it internally to compose asynchronous
 logic and to provide Reactive Streams support. Generally, WebFlux APIs return `Flux` or
 `Mono` (since those are used internally) and leniently accept any Reactive Streams
-`Publisher` implementation as input. The use of `Flux` versus `Mono` is important, because
-it helps to express cardinality -- for example, whether a single or multiple asynchronous
-values are expected, and that can be essential for making decisions (for example, when
-encoding or decoding HTTP messages).
+`Publisher` implementation as input.
+When a `Publisher` is provided, it can be treated only as a stream with unknown semantics (0..N).
+If, however, the semantics are known, you should wrap it with `Flux` or `Mono.from(Publisher)` instead
+of passing the raw `Publisher`.
+The use of `Flux` versus `Mono` is important, because it helps to express cardinality --
+for example, whether a single or multiple asynchronous values are expected,
+and that can be essential for making decisions (for example, when encoding or decoding HTTP messages).
 
 For annotated controllers, WebFlux transparently adapts to the reactive library chosen by
 the application. This is done with the help of the
@@ -15,15 +18,3 @@ the application. This is done with the help of the
 provides pluggable support for reactive library and other asynchronous types. The registry
 has built-in support for RxJava 3, Kotlin coroutines and SmallRye Mutiny, but you can
 register others, too.
-
-For functional APIs (such as <<webflux-fn>>, the `WebClient`, and others), the general rules
-for WebFlux APIs apply -- `Flux` and `Mono` as return values and a Reactive Streams
-`Publisher` as input. When a `Publisher`, whether custom or from another reactive library,
-is provided, it can be treated only as a stream with unknown semantics (0..N). If, however,
-the semantics are known, you can wrap it with `Flux` or `Mono.from(Publisher)` instead
-of passing the raw `Publisher`.
-
-For example, given a `Publisher` that is not a `Mono`, the Jackson JSON message writer
-expects multiple values. If the media type implies an infinite stream (for example,
-`application/json+stream`), values are written and flushed individually. Otherwise,
-values are buffered into a list and rendered as a JSON array.

framework-docs/modules/ROOT/pages/web/webflux-webclient/client-retrieve.adoc

@@ -97,8 +97,8 @@ Java::
 	Mono<Person> result = client.get()
 			.uri("/persons/{id}", id).accept(MediaType.APPLICATION_JSON)
 			.retrieve()
-			.onStatus(HttpStatus::is4xxClientError, response -> ...)
-			.onStatus(HttpStatus::is5xxServerError, response -> ...)
+			.onStatus(HttpStatusCode::is4xxClientError, response -> ...)
+			.onStatus(HttpStatusCode::is5xxServerError, response -> ...)
 			.bodyToMono(Person.class);
 ----
 
@@ -109,8 +109,8 @@ Kotlin::
 	val result = client.get()
 			.uri("/persons/{id}", id).accept(MediaType.APPLICATION_JSON)
 			.retrieve()
-			.onStatus(HttpStatus::is4xxClientError) { ... }
-			.onStatus(HttpStatus::is5xxServerError) { ... }
+			.onStatus(HttpStatusCode::is4xxClientError) { ... }
+			.onStatus(HttpStatusCode::is5xxServerError) { ... }
 			.awaitBody<Person>()
 ----
 ======

framework-docs/modules/ROOT/pages/web/webflux/ann-rest-exceptions.adoc

@@ -5,14 +5,14 @@
 
 A common requirement for REST services is to include details in the body of error
 responses. The Spring Framework supports the "Problem Details for HTTP APIs"
-specification, {rfc-site}/rfc7807.html[RFC 7807].
+specification, {rfc-site}/rfc9457.html[RFC 9457].
 
 The following are the main abstractions for this support:
 
-- `ProblemDetail` -- representation for an RFC 7807 problem detail; a simple container
+- `ProblemDetail` -- representation for an RFC 9457 problem detail; a simple container
 for both standard fields defined in the spec, and for non-standard ones.
 - `ErrorResponse` -- contract to expose HTTP error response details including HTTP
-status, response headers, and a body in the format of RFC 7807; this allows exceptions to
+status, response headers, and a body in the format of RFC 9457; this allows exceptions to
 encapsulate and expose the details of how they map to an HTTP response. All Spring WebFlux
 exceptions implement this.
 - `ErrorResponseException` -- basic `ErrorResponse` implementation that others
@@ -28,7 +28,7 @@ and any `ErrorResponseException`, and renders an error response with a body.
 [.small]#xref:web/webmvc/mvc-ann-rest-exceptions.adoc#mvc-ann-rest-exceptions-render[See equivalent in the Servlet stack]#
 
 You can return `ProblemDetail` or `ErrorResponse` from any `@ExceptionHandler` or from
-any `@RequestMapping` method to render an RFC 7807 response. This is processed as follows:
+any `@RequestMapping` method to render an RFC 9457 response. This is processed as follows:
 
 - The `status` property of `ProblemDetail` determines the HTTP status.
 - The `instance` property of `ProblemDetail` is set from the current URL path, if not
@@ -37,7 +37,7 @@ already set.
 "application/problem+json" over "application/json" when rendering a `ProblemDetail`,
 and also falls back on it if no compatible media type is found.
 
-To enable RFC 7807 responses for Spring WebFlux exceptions and for any
+To enable RFC 9457 responses for Spring WebFlux exceptions and for any
 `ErrorResponseException`, extend `ResponseEntityExceptionHandler` and declare it as an
 xref:web/webflux/controller/ann-advice.adoc[@ControllerAdvice] in Spring configuration. The handler
 has an `@ExceptionHandler` method that handles any `ErrorResponse` exception, which
@@ -50,7 +50,7 @@ use a protected method to map any exception to a `ProblemDetail`.
 == Non-Standard Fields
 [.small]#xref:web/webmvc/mvc-ann-rest-exceptions.adoc#mvc-ann-rest-exceptions-non-standard[See equivalent in the Servlet stack]#
 
-You can extend an RFC 7807 response with non-standard fields in one of two ways.
+You can extend an RFC 9457 response with non-standard fields in one of two ways.
 
 One, insert into the "properties" `Map` of `ProblemDetail`. When using the Jackson
 library, the Spring Framework registers `ProblemDetailJacksonMixin` that ensures this

framework-docs/modules/ROOT/pages/web/webflux/config.adoc

@@ -338,7 +338,7 @@ Kotlin::
 	class WebConfig : WebFluxConfigurer {
 
 		override fun configureHttpMessageCodecs(configurer: ServerCodecConfigurer) {
-			// ...
+			configurer.defaultCodecs().maxInMemorySize(512 * 1024)
 		}
 	}
 ----

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-methods/jackson.adoc

@@ -81,7 +81,7 @@ Kotlin::
 ----
 ======
 
-NOTE: `@JsonView` allows an array of view classes but you can only specify only one per
+NOTE: `@JsonView` allows an array of view classes but you can specify only one per
 controller method. Use a composite interface if you need to activate multiple views.
 
 

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-methods/return-types.adoc

@@ -4,9 +4,20 @@
 [.small]#xref:web/webmvc/mvc-controller/ann-methods/return-types.adoc[See equivalent in the Servlet stack]#
 
 The following table shows the supported controller method return values. Note that reactive
-types from libraries such as Reactor, RxJava, xref:web-reactive.adoc#webflux-reactive-libraries[or other] are
+types from libraries such as Reactor, RxJava, xref:web/webflux-reactive-libraries.adoc[or other] are
 generally supported for all return values.
 
+For return types like `Flux`, when multiple values are expected, elements are streamed as they come
+and are not buffered. This is the default behavior, as keeping a potentially large amount of elements in memory
+is not efficient. If the media type implies an infinite stream (for example,
+`application/json+stream`), values are written and flushed individually. Otherwise,
+values are written individually and the flushing happens separately.
+
+NOTE: If an error happens while an element is encoded to JSON, the response might have been written to and committed already
+and it is impossible at that point to render a proper error response.
+In some cases, applications can choose to trade memory efficiency for better handling such errors by buffering elements and encoding them all at once.
+Controllers can then return a `Flux<List<B>>`; Reactor provides a dedicated operator for that, `Flux#collectList()`.
+
 [cols="1,2", options="header"]
 |===
 | Controller method return value | Description
@@ -24,11 +35,11 @@ generally supported for all return values.
 | For returning a response with headers and no body.
 
 | `ErrorResponse`
-| To render an RFC 7807 error response with details in the body,
+| To render an RFC 9457 error response with details in the body,
   see xref:web/webflux/ann-rest-exceptions.adoc[Error Responses]
 
 | `ProblemDetail`
-| To render an RFC 7807 error response with details in the body,
+| To render an RFC 9457 error response with details in the body,
   see xref:web/webflux/ann-rest-exceptions.adoc[Error Responses]
 
 | `String`

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-requestmapping.adoc

@@ -28,6 +28,12 @@ because, arguably, most controller methods should be mapped to a specific HTTP m
 using `@RequestMapping`, which, by default, matches to all HTTP methods. At the same time, a
 `@RequestMapping` is still needed at the class level to express shared mappings.
 
+NOTE: `@RequestMapping` cannot be used in conjunction with other `@RequestMapping`
+annotations that are declared on the same element (class, interface, or method). If
+multiple `@RequestMapping` annotations are detected on the same element, a warning will
+be logged, and only the first mapping will be used. This also applies to composed
+`@RequestMapping` annotations such as `@GetMapping`, `@PostMapping`, etc.
+
 The following example uses type and method level mappings:
 
 [tabs]
@@ -436,8 +442,14 @@ attributes with a narrower, more specific purpose.
 `@GetMapping`, `@PostMapping`, `@PutMapping`, `@DeleteMapping`, and `@PatchMapping` are
 examples of composed annotations. They are provided, because, arguably, most
 controller methods should be mapped to a specific HTTP method versus using `@RequestMapping`,
-which, by default, matches to all HTTP methods. If you need an example of composed
-annotations, look at how those are declared.
+which, by default, matches to all HTTP methods. If you need an example of how to implement
+a composed annotation, look at how those are declared.
+
+NOTE: `@RequestMapping` cannot be used in conjunction with other `@RequestMapping`
+annotations that are declared on the same element (class, interface, or method). If
+multiple `@RequestMapping` annotations are detected on the same element, a warning will
+be logged, and only the first mapping will be used. This also applies to composed
+`@RequestMapping` annotations such as `@GetMapping`, `@PostMapping`, etc.
 
 Spring WebFlux also supports custom request mapping attributes with custom request matching
 logic. This is a more advanced option that requires sub-classing
@@ -511,10 +523,17 @@ Kotlin::
 == `@HttpExchange`
 [.small]#xref:web/webmvc/mvc-controller/ann-requestmapping.adoc#mvc-ann-httpexchange-annotation[See equivalent in the Servlet stack]#
 
-As an alternative to  `@RequestMapping`, you can also handle requests with `@HttpExchange`
-methods. Such methods are declared on an
-xref:integration/rest-clients.adoc#rest-http-interface[HTTP Interface] and can be used as
-a client via `HttpServiceProxyFactory` or implemented by a server `@Controller`.
+While the main purpose of `@HttpExchange` is to abstract HTTP client code with a
+generated proxy, the
+xref:integration/rest-clients.adoc#rest-http-interface[HTTP Interface] on which
+such annotations are placed is a contract neutral to client vs server use.
+In addition to simplifying client code, there are also cases where an HTTP Interface
+may be a convenient way for servers to expose their API for client access. This leads
+to increased coupling between client and server and is often not a good choice,
+especially for public API's, but may be exactly the goal for an internal API.
+It is an approach commonly used in Spring Cloud, and it is why `@HttpExchange` is
+supported as an alternative to `@RequestMapping` for server side handling in
+controller classes.
 
 For example:
 
@@ -524,16 +543,23 @@ Java::
 +
 [source,java,indent=0,subs="verbatim,quotes",role="primary"]
 ----
-	@RestController
 	@HttpExchange("/persons")
-	class PersonController {
+	interface PersonService {
 
 		@GetExchange("/{id}")
+		Person getPerson(@PathVariable Long id);
+
+		@PostExchange
+		void add(@RequestBody Person person);
+	}
+
+	@RestController
+	class PersonController implements PersonService {
+
 		public Person getPerson(@PathVariable Long id) {
 			// ...
 		}
 
-		@PostExchange
 		@ResponseStatus(HttpStatus.CREATED)
 		public void add(@RequestBody Person person) {
 			// ...
@@ -545,30 +571,38 @@ Kotlin::
 +
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
 ----
-	@RestController
 	@HttpExchange("/persons")
-	class PersonController {
+	interface PersonService {
 
 		@GetExchange("/{id}")
-		fun getPerson(@PathVariable id: Long): Person {
+		fun getPerson(@PathVariable id: Long): Person
+
+		@PostExchange
+		fun add(@RequestBody person: Person)
+	}
+
+	@RestController
+	class PersonController : PersonService {
+
+		override fun getPerson(@PathVariable id: Long): Person {
 			// ...
 		}
 
-		@PostExchange
 		@ResponseStatus(HttpStatus.CREATED)
-		fun add(@RequestBody person: Person) {
+		override fun add(@RequestBody person: Person) {
 			// ...
 		}
 	}
 ----
 ======
 
-There some differences between `@HttpExchange` and `@RequestMapping` since the
-former needs to remain suitable for client and server use. For example, while
-`@RequestMapping` can be declared to handle any number of paths and each path can
-be a pattern, `@HttpExchange` must be declared with a single, concrete path. There are
-also differences in the supported method parameters. Generally, `@HttpExchange` supports
-a subset of method parameters that `@RequestMapping` does, excluding any parameters that
-are server side only. For details see the list of supported method parameters for
-xref:integration/rest-clients.adoc#rest-http-interface-method-parameters[HTTP interface] and for
+`@HttpExchange` and `@RequestMapping` have differences.
+`@RequestMapping` can map to any number of requests by path patterns, HTTP methods,
+and more, while `@HttpExchange` declares a single endpoint with a concrete HTTP method,
+path, and content types.
+
+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].

framework-docs/modules/ROOT/pages/web/webflux/controller/ann-validation.adoc

@@ -3,27 +3,40 @@
 
 [.small]#xref:web/webmvc/mvc-controller/ann-validation.adoc[See equivalent in the Servlet stack]#
 
-Spring WebFlux has built-in xref:core/validation/validator.adoc[Validation] support for
-`@RequestMapping` methods, including the option to use
-xref:core/validation/beanvalidation.adoc[Java Bean Validation].
-The validation support works on two levels.
+Spring WebFlux has built-in xref:core/validation/validator.adoc[Validation] for
+`@RequestMapping` methods, including xref:core/validation/beanvalidation.adoc[Java Bean Validation].
+Validation may be applied at one of two levels:
 
-First, method parameters such as
-xref:web/webflux/controller/ann-methods/modelattrib-method-args.adoc[@ModelAttribute],
+1. xref:web/webflux/controller/ann-methods/modelattrib-method-args.adoc[@ModelAttribute],
 xref:web/webflux/controller/ann-methods/requestbody.adoc[@RequestBody], and
-xref:web/webflux/controller/ann-methods/multipart-forms.adoc[@RequestPart] do perform
-validation if annotated with Jakarta's `@Valid` or Spring's `@Validated` annotation, and
-raise `MethodArgumentNotValidException` in case of validation errors. If you want to handle
-the errors in the controller method instead, you can declare an `Errors` or `BindingResult`
-method parameter immediately after the validated parameter.
+xref:web/webflux/controller/ann-methods/multipart-forms.adoc[@RequestPart] argument
+resolvers validate a method argument individually if the method parameter is annotated
+with Jakarta `@Valid` or Spring's `@Validated`, _AND_ there is no `Errors` or
+`BindingResult` parameter immediately after, _AND_ method validation is not needed (to be
+discussed next). The exception raised in this case is `MethodArgumentNotValidException`.
 
-Second, if {bean-validation-site}[Java Bean Validation] is present _AND_ other method
-parameters, e.g. `@RequestHeader`, `@RequestParam`, `@PathVariable` have `@Constraint`
-annotations, then method validation is applied to all method arguments, raising
-`HandlerMethodValidationException` in case of validation errors. You can still declare an
-`Errors` or `BindingResult` after an `@Valid` method parameter, and handle validation
-errors within the controller method, as long as there are no validation errors on other
-method arguments.
+2. When `@Constraint` annotations such as `@Min`, `@NotBlank` and others are declared
+directly on method parameters, or on the method (for the return value), then method
+validation must be applied, and that supersedes validation at the method argument level
+because method validation covers both method parameter constraints and nested constraints
+via `@Valid`. The exception raised in this case is `HandlerMethodValidationException`.
+
+Applications must handle both `MethodArgumentNotValidException` and
+`HandlerMethodValidationException` as either may be raised depending on the controller
+method signature. The two exceptions, however are designed to be very similar, and can be
+handled with almost identical code. The main difference is that the former is for a single
+object while the latter is for a list of method parameters.
+
+NOTE: `@Valid` is not a constraint annotation, but rather for nested constraints within
+an Object. Therefore, by itself `@Valid` does not lead to method validation. `@NotNull`
+on the other hand is a constraint, and adding it to an `@Valid` parameter leads to method
+validation. For nullability specifically, you may also use the `required` flag of
+`@RequestBody` or `@ModelAttribute`.
+
+Method validation may be used in combination with `Errors` or `BindingResult` method
+parameters. However, the controller method is called only if all validation errors are on
+method parameters with an `Errors` immediately after. If there are validation errors on
+any other method parameter then `HandlerMethodValidationException` is raised.
 
 You can configure a `Validator` globally through the
 xref:web/webflux/config.adoc#webflux-config-validation[WebMvc config], or locally

framework-docs/modules/ROOT/pages/web/webmvc-functional.adoc

@@ -760,6 +760,73 @@ Kotlin::
 ======
 
 
+[[webmvc-fn-serving-resources]]
+== Serving Resources
+
+WebMvc.fn provides built-in support for serving resources.
+
+NOTE: In addition to the capabilities described below, it is possible to implement even more flexible resource handling thanks to
+{spring-framework-api}++/web/servlet/function/RouterFunctions.html#resources(java.util.function.Function)++[`RouterFunctions#resource(java.util.function.Function)`].
+
+[[webmvc-fn-resource]]
+=== Redirecting to a resource
+
+It is possible to redirect requests matching a specified predicate to a resource. This can be useful, for example,
+for handling redirects in Single Page Applications.
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+    ClassPathResource index = new ClassPathResource("static/index.html");
+	List<String> extensions = Arrays.asList("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();
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+    val redirectToIndex = router {
+		val index = ClassPathResource("static/index.html")
+		val extensions = listOf("js", "css", "ico", "png", "jpg", "gif")
+		val spaPredicate = !(path("/api/**") or path("/error") or
+			pathExtension(extensions::contains))
+		resource(spaPredicate, index)
+	}
+----
+======
+
+[[webmvc-fn-resources]]
+=== Serving resources from a root location
+
+It is also possible to route requests that match a given pattern to resources relative to a given root location.
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+    Resource location = new FileSystemResource("public-resources/");
+    RouterFunction<ServerResponse> resources = RouterFunctions.resources("/resources/**", location);
+----
+
+Kotlin::
++
+[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+    val location = FileSystemResource("public-resources/")
+    val resources = router { resources("/resources/**", location) }
+----
+======
+
+
 [[webmvc-fn-running]]
 == Running a Server
 [.small]#xref:web/webflux-functional.adoc#webflux-fn-running[See equivalent in the Reactive stack]#

framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jackson.adoc

@@ -36,7 +36,7 @@ to render the response content as XML. If the model contains multiple entries, y
 explicitly set the object to be serialized by using the `modelKey` bean property. If the
 model contains a single entry, it is serialized automatically.
 
-You can customized XML mapping as needed by using JAXB or Jackson's provided
+You can customize XML mapping as needed by using JAXB or Jackson's provided
 annotations. When you need further control, you can inject a custom `XmlMapper`
 through the `ObjectMapper` property, for cases where custom XML
 you need to provide serializers and deserializers for specific types.

framework-docs/modules/ROOT/pages/web/webmvc-view/mvc-jsp.adoc

@@ -683,7 +683,7 @@ the HTML would be as follows:
 ----
 
 What if we want to display the entire list of errors for a given page? The next example
-shows that the `errors` tag also supports some basic wildcarding functionality.
+shows that the `errors` tag also supports some basic wildcard functionality.
 
 * `path="{asterisk}"`: Displays all errors.
 * `path="lastName"`: Displays all errors associated with the `lastName` field.

framework-docs/modules/ROOT/pages/web/webmvc/filters.adoc

@@ -78,8 +78,9 @@ it does the same, but it also compares the computed value against the `If-None-M
 request header and, if the two are equal, returns a 304 (NOT_MODIFIED).
 
 This strategy saves network bandwidth but not CPU, as the full response must be computed for each request.
-State-changing HTTP methods and other HTTP conditional request headers such as `If-Match` and `If-Unmodified-Since` are outside the scope of this filter.
-Other strategies at the controller level can avoid the computation and have a broader support for HTTP conditional requests.
+State-changing HTTP methods and other HTTP conditional request headers such as `If-Match` and
+`If-Unmodified-Since` are outside the scope of this filter. Other strategies at the controller level
+can avoid the computation and have a broader support for HTTP conditional requests.
 See xref:web/webmvc/mvc-caching.adoc[HTTP Caching].
 
 This filter has a `writeWeakETag` parameter that configures the filter to write weak ETags