.mailmap

@@ -30,5 +30,7 @@ Andy Clement <aclement@vmware.com> <andrew.clement@gmail.com>
 Sam Brannen <sbrannen@vmware.com>
 Sam Brannen <sbrannen@vmware.com> <sbrannen@pivotal.io>
 Sam Brannen <sbrannen@vmware.com> <sam@sambrannen.com>
+Simon Basle <sbasle@vmware.com>
+Simon Baslé <sbasle@vmware.com>
 <dmitry.katsubo@gmail.com> <dmitry.katsubo@gmai.com>
 Nick Williams <nicholas@nicholaswilliams.net>

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

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'io.spring.nohttp' version '0.0.10'
+	id 'io.spring.nohttp' version '0.0.11'
 	id 'io.freefair.aspectj' version '6.5.0.3' apply false
 	// kotlinVersion is managed in gradle.properties
 	id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false
@@ -78,7 +78,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "10.6.0"
+		toolVersion = "10.7.0"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 
@@ -121,9 +121,9 @@ configure([rootProject] + javaProjects) { project ->
 			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
 			"https://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
 			"https://www.quartz-scheduler.org/api/2.3.0/",
-			"https://fasterxml.github.io/jackson-core/javadoc/2.10/",
-			"https://fasterxml.github.io/jackson-databind/javadoc/2.10/",
-			"https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.10/",
+			"https://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.14.1/",
+			"https://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/2.14.1/",
+			"https://www.javadoc.io/doc/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.14.1/",
 			"https://hc.apache.org/httpcomponents-client-5.2.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",

ci/config/changelog-generator.yml

@@ -17,4 +17,4 @@ changelog:
         - "type: dependency-upgrade"
   contributors:
     exclude:
-      names: ["bclozel", "jhoeller", "poutsma", "rstoyanchev", "sbrannen", "sdeleuze", "snicoll"]
+      names: ["bclozel", "jhoeller", "poutsma", "rstoyanchev", "sbrannen", "sdeleuze", "snicoll", "simonbasle"]

ci/images/ci-image/Dockerfile

@@ -6,7 +6,6 @@ RUN ./setup.sh
 
 ENV JAVA_HOME /opt/openjdk/java17
 ENV JDK17 /opt/openjdk/java17
-ENV JDK18 /opt/openjdk/java18
 ENV JDK19 /opt/openjdk/java19
 
 ENV PATH $JAVA_HOME/bin:$PATH

ci/images/get-jdk-url.sh

@@ -3,13 +3,10 @@ set -e
 
 case "$1" in
 	java17)
-		echo "https://github.com/bell-sw/Liberica/releases/download/17.0.5+8/bellsoft-jdk17.0.5+8-linux-amd64.tar.gz"
-	;;
-	java18)
-		echo "https://github.com/bell-sw/Liberica/releases/download/18.0.2.1%2B1/bellsoft-jdk18.0.2.1+1-linux-amd64.tar.gz"
+		echo "https://github.com/bell-sw/Liberica/releases/download/17.0.6+10/bellsoft-jdk17.0.6+10-linux-amd64.tar.gz"
 	;;
 	java19)
-		echo "https://github.com/bell-sw/Liberica/releases/download/19.0.1%2B11/bellsoft-jdk19.0.1+11-linux-amd64.tar.gz"
+		echo "https://github.com/bell-sw/Liberica/releases/download/19.0.2+9/bellsoft-jdk19.0.2+9-linux-amd64.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 java18 java19
+for jdk in java17 java19
 do
   JDK_URL=$( /get-jdk-url.sh $jdk )
   mkdir $jdk

ci/parameters.yml

@@ -8,7 +8,4 @@ milestone: "6.0.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
-registry-mirror-host: docker.repo.spring.io
-registry-mirror-username: ((artifactory-username))
-registry-mirror-password: ((artifactory-password))
 task-timeout: 1h00m

ci/pipeline.yml

@@ -23,11 +23,6 @@ anchors:
   docker-resource-source: &docker-resource-source
     username: ((docker-hub-username))
     password: ((docker-hub-password))
-    tag: ((milestone))
-  registry-mirror-vars: &registry-mirror-vars
-    registry-mirror-host: ((registry-mirror-host))
-    registry-mirror-username: ((registry-mirror-username))
-    registry-mirror-password: ((registry-mirror-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!>
@@ -48,31 +43,37 @@ resource_types:
 - name: registry-image
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: concourse/registry-image-resource
     tag: 1.5.0
 - name: artifactory-resource
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: springio/artifactory-resource
-    tag: 0.0.17
+    tag: 0.0.18
 - name: github-release
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: concourse/github-release-resource
     tag: 1.5.5
 - name: github-status-resource
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: dpb587/github-status-resource
     tag: master
 - name: pull-request
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: teliaoss/github-pr-resource
     tag: v0.23.0
 - name: slack-notification
   type: registry-image
   source:
+    <<: *docker-resource-source
     repository: cfcommunity/slack-notification-resource
     tag: latest
 resources:
@@ -94,6 +95,7 @@ resources:
   source:
     <<: *docker-resource-source
     repository: ((docker-hub-organization))/spring-framework-ci
+    tag: ((milestone))
 - name: every-morning
   type: time
   icon: alarm
@@ -125,14 +127,6 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: build
-- name: repo-status-jdk18-build
-  type: github-status-resource
-  icon: eye-check-outline
-  source:
-    repository: ((github-repo-name))
-    access_token: ((github-ci-status-token))
-    branch: ((branch))
-    context: jdk18-build
 - name: repo-status-jdk19-build
   type: github-status-resource
   icon: eye-check-outline
@@ -176,7 +170,7 @@ jobs:
         image: ci-image
       vars:
         ci-image-name: ci-image
-        <<: *registry-mirror-vars
+        <<: *docker-resource-source
     - put: ci-image
       params:
         image: ci-image/image.tar
@@ -237,34 +231,6 @@ jobs:
           "zip.type": "schema"
     get_params:
       threads: 8
-- name: jdk18-build
-  serial: true
-  public: true
-  plan:
-    - get: ci-image
-    - get: git-repo
-    - get: every-morning
-      trigger: true
-    - put: repo-status-jdk18-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: 18
-            <<: *build-project-task-params
-      on_failure:
-        do:
-          - put: repo-status-jdk18-build
-            params: { state: "failure", commit: "git-repo" }
-          - put: slack-alert
-            params:
-              <<: *slack-fail-params
-    - put: repo-status-jdk18-build
-      params: { state: "success", commit: "git-repo" }
 - name: jdk19-build
   serial: true
   public: true
@@ -365,6 +331,7 @@ jobs:
       params:
         RELEASE_TYPE: M
         <<: *github-task-params
+        <<: *docker-resource-source
     - put: github-pre-release
       params:
         <<: *changelog-task-params
@@ -403,6 +370,7 @@ jobs:
       file: git-repo/ci/tasks/promote-version.yml
       params:
         RELEASE_TYPE: RC
+        <<: *docker-resource-source
         <<: *artifactory-task-params
     - task: generate-changelog
       file: git-repo/ci/tasks/generate-changelog.yml
@@ -447,6 +415,7 @@ jobs:
       file: git-repo/ci/tasks/promote-version.yml
       params:
         RELEASE_TYPE: RELEASE
+        <<: *docker-resource-source
         <<: *artifactory-task-params
         <<: *sonatype-task-params
 - name: create-github-release
@@ -464,14 +433,15 @@ jobs:
       file: git-repo/ci/tasks/generate-changelog.yml
       params:
         RELEASE_TYPE: RELEASE
+        <<: *docker-resource-source
         <<: *github-task-params
     - put: github-release
       params:
         <<: *changelog-task-params
 
 groups:
 - name: "builds"
-  jobs: ["build", "jdk18-build", "jdk19-build"]
+  jobs: ["build", "jdk19-build"]
 - name: "releases"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"

ci/scripts/check-project.sh

@@ -4,6 +4,6 @@ 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,JDK18 \
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK17,JDK19 \
   -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check
 popd > /dev/null

ci/tasks/build-ci-image.yml

@@ -5,10 +5,8 @@ image_resource:
   source:
     repository: concourse/oci-build-task
     tag: 0.10.0
-    registry_mirror:
-      host: ((registry-mirror-host))
-      username: ((registry-mirror-username))
-      password: ((registry-mirror-password))
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
 inputs:
   - name: ci-images-git-repo
 outputs:

ci/tasks/generate-changelog.yml

@@ -5,6 +5,8 @@ image_resource:
   source:
     repository: springio/github-changelog-generator
     tag: '0.0.8'
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
 inputs:
 - name: git-repo
 - name: artifactory-repo

ci/tasks/promote-version.yml

@@ -5,6 +5,8 @@ image_resource:
   source:
     repository: springio/concourse-release-scripts
     tag: '0.3.4'
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
 inputs:
 - name: git-repo
 - name: artifactory-repo

framework-docs/framework-docs.gradle

@@ -28,13 +28,7 @@ javadoc {
 }
 
 dependencies {
-	asciidoctorExtensions "io.spring.asciidoctor.backends:spring-asciidoctor-backends:0.0.3"
-}
-
-repositories {
-	maven {
-		url "https://repo.spring.io/release"
-	}
+	asciidoctorExtensions "io.spring.asciidoctor.backends:spring-asciidoctor-backends:0.0.4"
 }
 
 /**

framework-docs/src/docs/asciidoc/attributes.adoc

@@ -1,4 +1,5 @@
 :chomp:                         default headers packages
+:fold:                          all
 :docs-site:                     https://docs.spring.io
 // Spring Framework
 :docs-spring-framework:         {docs-site}/spring-framework/docs/{spring-version}

framework-docs/src/docs/asciidoc/core/core-aop-api.adoc

@@ -1100,12 +1100,15 @@ subclass is used to implement the Decorator pattern, weaving in the advice.
 CGLIB proxying should generally be transparent to users. However, there are some issues
 to consider:
 
-* `Final` methods cannot be advised, as they cannot be overridden.
-* There is no need to add CGLIB to your classpath. As of Spring 3.2, CGLIB is repackaged
-  and included in the spring-core JAR. In other words, CGLIB-based AOP works "`out of
-  the box`", as do JDK dynamic proxies.
+* `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.
 
-There is little performance difference between CGLIB proxying and dynamic proxies.
+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
+JDK dynamic proxies.
+
+There is little performance difference between CGLIB proxies and dynamic proxies.
 Performance should not be a decisive consideration in this case.
 
 

framework-docs/src/docs/asciidoc/core/core-aot.adoc

@@ -17,6 +17,8 @@ Applying such optimizations early implies the following restrictions:
 * The beans defined in your application cannot change at runtime, meaning:
 ** `@Profile`, in particular profile-specific configuration needs to be chosen at build time.
 ** 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) can't be transformed Ahead of Time (see https://github.com/spring-projects/spring-framework/issues/29555[spring-framework#29555] related issue)
+* The return type of methods annotated with `@Bean` should be the most specific one in order to allow proper hint inference (typically the concrete class, not an interface).
 
 When these restrictions are in place, it becomes possible to perform ahead-of-time processing at build time and generate additional assets.
 A Spring AOT processed application typically generates: