Next development version (v5.2.26.BUILD-SNAPSHOT)

Add "/framework-docs/build" to .gitignore
Use docker credentials for fetching changelog image
2026-06-08 17:33:33 +00:00 · 2023-07-13 07:51:55 +00:00 · 2023-07-12 11:57:12 +02:00 · 2023-07-12 08:30:00 +02:00 · 2023-07-12 08:23:28 +02:00 · 2023-07-12 08:22:34 +02:00
2873 changed files with 61257 additions and 108873 deletions
@@ -1,5 +1,5 @@
 <!--
-!!! For Security Vulnerabilities, please go to https://spring.io/security-policy !!!
+!!! For Security Vulnerabilities, please go to https://pivotal.io/security !!!
 -->
 **Affects:** \<Spring Framework version>

@@ -14,4 +14,4 @@ Thanks for taking the time to create an issue. Please read the following:
 Issue or Pull Request? Create only one, not both. GitHub treats them as the same.
 If unsure, start with an issue, and if you submit a pull request later, the
 issue will be closed as superseded.
-->
+-->
@@ -23,6 +23,7 @@ buildSrc/build
 /spring-*/build
 /spring-core/kotlin-coroutines/build
 /framework-bom/build
+/framework-docs/build
 /integration-tests/build
 /src/asciidoc/build
 target/
@@ -42,5 +43,4 @@ test-output
 atlassian-ide-plugin.xml
 .gradletasknamecache

-# VS Code
-.vscode/
+cached-antora-playbook.yml
@@ -1,3 +0,0 @@
-# Enable auto-env through the sdkman_auto_env config
-# Add key=value pairs of SDKs to use below
-java=8.0.322-librca
@@ -72,7 +72,7 @@ to start a discussion first or have already created an issue, once a pull reques
 created, we will close the issue as superseded by the pull request, and the discussion
 about the issue will continue under the pull request.

-1. Always check out the `main` branch and submit pull requests against it
+1. Always check out the `master` branch and submit pull requests against it
 (for target version see [settings.gradle](settings.gradle)).
 Backports to prior versions will be considered on a case-by-case basis and reflected as
 the fix version in the issue tracker.
@@ -125,7 +125,10 @@ The reference documentation is in the [src/docs/asciidoc](src/docs/asciidoc) dir
 edit source files, and submit directly from GitHub.

 When making changes locally, execute `./gradlew asciidoctor` and then browse the result under
-`build/docs/ref-docs/html5/index.html`.
+`build/asciidoc/html5/index.html`.

-Asciidoctor also supports live editing. For more details see
-[AsciiDoc Tooling](https://docs.asciidoctor.org/asciidoctor/latest/tooling/).
+Asciidoctor also supports live editing. For more details read
+[Editing AsciiDoc with Live Preview](https://asciidoctor.org/docs/editing-asciidoc-with-live-preview/).
+Note that if you choose the
+[System Monitor](https://asciidoctor.org/docs/editing-asciidoc-with-live-preview/#using-a-system-monitor)
+option, you can find a Guardfile under `src/docs/asciidoc`.
@@ -1,4 +1,4 @@
-# <img src="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-5.3.x/jobs/build/badge)](https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-5.3.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="src/docs/asciidoc/images/spring-framework.png" width="80" height="80"> Spring Framework [![Build Status](https://ci.spring.io/api/v1/teams/spring-framework/pipelines/spring-framework-5.2.x/jobs/build/badge)](https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-5.2.x?groups=Build")

 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". 

@@ -17,18 +17,10 @@ For access to artifacts or a distribution zip, see the [Spring Framework Artifac
 The Spring Framework maintains reference documentation ([published](https://docs.spring.io/spring-framework/docs/current/spring-framework-reference/) and [source](src/docs/asciidoc)), Github [wiki pages](https://github.com/spring-projects/spring-framework/wiki), and an
 [API reference](https://docs.spring.io/spring-framework/docs/current/javadoc-api/). There are also [guides and tutorials](https://spring.io/guides) across Spring projects.

-## Micro-Benchmarks
-
-See the [Micro-Benchmarks](https://github.com/spring-projects/spring-framework/wiki/Micro-Benchmarks) Wiki page.
-
 ## Build from Source

 See the [Build from Source](https://github.com/spring-projects/spring-framework/wiki/Build-from-Source) Wiki page and the [CONTRIBUTING.md](CONTRIBUTING.md) file.

-## Continuous Integration Builds
-
-Information regarding CI builds can be found in the [Spring Framework Concourse pipeline](ci/README.adoc) documentation.
-
 ## 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 [news feed](https://spring.io/blog/category/news).
@@ -1,19 +1,18 @@
 plugins {
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
-	id 'io.spring.nohttp' version '0.0.10'
-	id "io.freefair.aspectj" version '6.2.0' apply false
-	id 'org.jetbrains.dokka' version '1.6.10' apply false
-	id 'org.jetbrains.kotlin.jvm' version '1.5.32' apply false
-	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.32" apply false
-	id 'org.asciidoctor.jvm.convert' version '3.3.2'
-	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
-	id "org.unbroken-dome.xjc" version '2.0.0' apply false
-	id "com.github.ben-manes.versions" version '0.39.0'
-	id "com.github.johnrengelman.shadow" version '7.0.0' apply false
-	id 'de.undercouch.download' version '4.1.2'
-	id "me.champeau.jmh" version "0.6.6" apply false
+	id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
+	id 'io.spring.ge.conventions' version '0.0.7'
+	id 'io.spring.nohttp' version '0.0.5.RELEASE'
+	id "io.freefair.aspectj" version '4.1.6' apply false
+	id 'org.jetbrains.dokka' version '0.10.1' apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.3.72' apply false
+	id 'org.asciidoctor.jvm.convert' version '2.4.0'
+	id 'org.asciidoctor.jvm.pdf' version '2.4.0'
+	id "com.github.ben-manes.versions" version '0.28.0'
+	id 'com.gradle.build-scan' version '3.2'
+	id 'de.undercouch.download' version '4.1.1'
 }

+apply from: "$rootDir/gradle/build-scan-user-data.gradle"
 ext {
 	moduleProjects = subprojects.findAll { it.name.startsWith("spring-") }
 	javaProjects = subprojects - project(":framework-bom")
@@ -27,16 +26,14 @@ configure(allprojects) { project ->

 	dependencyManagement {
 		imports {
-			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6"
-			mavenBom "io.netty:netty-bom:4.1.75.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.18"
-			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR13"
-			mavenBom "io.rsocket:rsocket-bom:1.1.2"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.46.v20220331"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.32"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.2"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.2"
-			mavenBom "org.junit:junit-bom:5.8.2"
+			mavenBom "com.fasterxml.jackson:jackson-bom:2.10.5"
+			mavenBom "io.netty:netty-bom:4.1.51.Final"
+			mavenBom "io.projectreactor:reactor-bom:Dysprosium-SR25"
+			mavenBom "io.rsocket:rsocket-bom:1.0.4"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.31.v20200723"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.3.72"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.3.5"
+			mavenBom "org.junit:junit-bom:5.6.3"
 		}
 		dependencies {
 			dependencySet(group: 'org.apache.logging.log4j', version: '2.17.2') {
@@ -45,10 +42,7 @@ configure(allprojects) { project ->
 				entry 'log4j-jul'
 				entry 'log4j-slf4j-impl'
 			}
-			dependency "org.slf4j:slf4j-api:1.7.36"
-			dependency("com.google.code.findbugs:findbugs:3.0.1") {
-				exclude group: "dom4j", name: "dom4j"
-			}
+			dependency "org.slf4j:slf4j-api:1.7.32"
 			dependency "com.google.code.findbugs:jsr305:3.0.2"

 			dependencySet(group: 'org.aspectj', version: '1.9.7') {
@@ -56,10 +50,10 @@ configure(allprojects) { project ->
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
 			}
-			dependencySet(group: 'org.codehaus.groovy', version: '3.0.9') {
+			dependencySet(group: 'org.codehaus.groovy', version: '2.5.15') {
 				entry 'groovy'
 				entry 'groovy-jsr223'
-				entry 'groovy-templates'  // requires findbugs for warning-free compilation
+				entry 'groovy-templates'
 				entry 'groovy-test'
 				entry 'groovy-xml'
 			}
@@ -67,23 +61,21 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava:1.3.8"
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
-			dependency "io.reactivex.rxjava3:rxjava:3.1.3"
-			dependency "io.smallrye.reactive:mutiny:1.4.0"
 			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"

 			dependency "com.caucho:hessian:4.0.63"
-			dependency "com.fasterxml:aalto-xml:1.3.1"
-			dependency("com.fasterxml.woodstox:woodstox-core:6.2.8") {
+			dependency "com.fasterxml:aalto-xml:1.2.2"
+			dependency("com.fasterxml.woodstox:woodstox-core:6.2.3") {
 				exclude group: "stax", name: "stax-api"
 			}
-			dependency "com.google.code.gson:gson:2.8.9"
-			dependency "com.google.protobuf:protobuf-java-util:3.19.3"
+			dependency "com.google.code.gson:gson:2.8.6"
+			dependency "com.google.protobuf:protobuf-java-util:3.11.4"
 			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
-			dependency("com.thoughtworks.xstream:xstream:1.4.18") {
+			dependency("com.thoughtworks.xstream:xstream:1.4.11.1") {
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.apache.johnzon:johnzon-jsonb:1.2.16"
+			dependency "org.apache.johnzon:johnzon-jsonb:1.2.10"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
@@ -92,16 +84,16 @@ configure(allprojects) { project ->
 				entry 'jibx-run'
 			}
 			dependency "org.ogce:xpp3:1.1.6"
-			dependency "org.yaml:snakeyaml:1.30"
+			dependency "org.yaml:snakeyaml:1.27"

-			dependency "com.h2database:h2:2.1.210"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.9.3"
-			dependency "com.github.librepdf:openpdf:1.3.27"
-			dependency "com.rometools:rome:1.18.0"
+			dependency "com.h2database:h2:1.4.200"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.8.8"
+			dependency "com.github.librepdf:openpdf:1.3.25"
+			dependency "com.rometools:rome:1.12.2"
 			dependency "commons-io:commons-io:2.5"
-			dependency "io.vavr:vavr:0.10.4"
+			dependency "io.vavr:vavr:0.10.3"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
-			dependencySet(group: 'org.apache.activemq', version: '5.16.2') {
+			dependencySet(group: 'org.apache.activemq', version: '5.8.0') {
 				entry 'activemq-broker'
 				entry('activemq-kahadb-store') {
 					exclude group: "org.springframework", name: "spring-context"
@@ -109,107 +101,103 @@ configure(allprojects) { project ->
 				entry 'activemq-stomp'
 			}
 			dependency "org.apache.bcel:bcel:6.0"
-			dependency "org.apache.commons:commons-pool2:2.9.0"
+			dependency "org.apache.commons:commons-pool2:2.8.1"
 			dependencySet(group: 'org.apache.derby', version: '10.14.2.0') {
 				entry 'derby'
 				entry 'derbyclient'
 			}
 			dependency "org.apache.poi:poi-ooxml:4.1.2"
 			dependency "org.apache-extras.beanshell:bsh:2.0b6"
-			dependency "org.freemarker:freemarker:2.3.31"
-			dependency "org.hsqldb:hsqldb:2.5.2"
+			dependency "org.freemarker:freemarker:2.3.30"
+			dependency "org.hsqldb:hsqldb:2.5.1"
 			dependency "org.quartz-scheduler:quartz:2.3.2"
 			dependency "org.codehaus.fabric3.api:commonj:1.1.0"
 			dependency "net.sf.ehcache:ehcache:2.10.6"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core:5.4.33.Final"
-			dependency "org.hibernate:hibernate-validator:6.2.3.Final"
-			dependency "org.webjars:webjars-locator-core:0.48"
+			dependency "org.hibernate:hibernate-core:5.4.28.Final"
+			dependency "org.hibernate:hibernate-validator:6.1.7.Final"
+			dependency "org.webjars:webjars-locator-core:0.46"
 			dependency "org.webjars:underscorejs:1.8.3"

-			dependencySet(group: 'org.apache.tomcat', version: '9.0.62') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.37') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
-					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
 					exclude group: "org.apache.tomcat", name: "tomcat-websocket-api"
+					exclude group: "org.apache.tomcat", name: "tomcat-servlet-api"
 				}
 			}
-			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.62') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.37') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.17.Final') {
+			dependencySet(group: 'io.undertow', version: '2.0.32.Final') {
 				entry 'undertow-core'
-				entry('undertow-servlet') {
-					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec"
-					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.3_spec"
-				}
 				entry('undertow-websockets-jsr') {
 					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
 				}
+				entry('undertow-servlet') {
+					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_3.1_spec"
+					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.2_spec"
+				}
 			}

-			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.11"
-			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1.3'
-			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.3'
-			dependency("org.apache.httpcomponents:httpclient:4.5.13") {
-				exclude group: "commons-logging", name: "commons-logging"
-			}
-			dependency("org.apache.httpcomponents:httpasyncclient:4.1.5") {
-				exclude group: "commons-logging", name: "commons-logging"
-			}
 			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.9') {
 				entry 'okhttp'
 				entry 'mockwebserver'
 			}
+			dependency("org.apache.httpcomponents:httpclient:4.5.13") {
+				exclude group: "commons-logging", name: "commons-logging"
+			}
+			dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") {
+				exclude group: "commons-logging", name: "commons-logging"
+			}
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.4"

-			dependency "org.jruby:jruby:9.2.20.1"
+			dependency "org.jruby:jruby:9.2.11.1"
 			dependency "org.python:jython-standalone:2.7.1"
 			dependency "org.mozilla:rhino:1.7.11"

 			dependency "commons-fileupload:commons-fileupload:1.4"
 			dependency "org.synchronoss.cloud:nio-multipart-parser:1.1.0"

-			dependency("org.dom4j:dom4j:2.1.3") {
-				exclude group: "jaxen", name: "jaxen"
-				exclude group: "net.java.dev.msv", name: "xsdlib"
-				exclude group: "pull-parser", name: "pull-parser"
-				exclude group: "xpp3", name: "xpp3"
+			dependency("dom4j:dom4j:1.6.1") {
+				exclude group: "xml-apis", name: "xml-apis"
 			}
-			dependency("jaxen:jaxen:1.2.0") {
-				exclude group: "dom4j", name: "dom4j"
+			dependency("jaxen:jaxen:1.1.1") {
+				exclude group: "xml-apis", name: "xml-apis"
+				exclude group: "xom", name: "xom"
+				exclude group: "xerces", name: "xercesImpl"
 			}

-			dependency("junit:junit:4.13.2") {
+			dependency("junit:junit:4.12") {
 				exclude group: "org.hamcrest", name: "hamcrest-core"
 			}
 			dependency("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1") {
 				exclude group: "junit", name: "junit"
 			}
-			dependency "org.testng:testng:7.4.0"
-			dependency "org.junit.support:testng-engine:1.0.1"
+			dependency "org.testng:testng:6.14.3"
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
-			dependency "org.assertj:assertj-core:3.22.0"
-			dependencySet(group: 'org.xmlunit', version: '2.9.0') {
+			dependency "org.assertj:assertj-core:3.18.1"
+			dependencySet(group: 'org.xmlunit', version: '2.6.2') {
 				entry 'xmlunit-assertj'
 				entry('xmlunit-matchers') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '4.4.0') {
+			dependencySet(group: 'org.mockito', version: '3.3.3') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 				entry 'mockito-junit-jupiter'
 			}
-			dependency "io.mockk:mockk:1.12.1"
+			dependency "io.mockk:mockk:1.10.2"

-			dependency("net.sourceforge.htmlunit:htmlunit:2.60.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.43.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.60.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.43.1") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -217,8 +205,7 @@ configure(allprojects) { project ->
 				exclude group: "io.netty", name: "netty"
 			}
 			dependency "org.skyscreamer:jsonassert:1.5.0"
-			dependency "com.jayway.jsonpath:json-path:2.6.0"
-			dependency "org.bouncycastle:bcpkix-jdk15on:1.66"
+			dependency "com.jayway.jsonpath:json-path:2.4.0"

 			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {
 				entry 'tiles-api'
@@ -237,8 +224,8 @@ configure(allprojects) { project ->

 			dependency "com.ibm.websphere:uow:6.0.2.17"
 			dependency "com.jamonapi:jamon:2.82"
-			dependency "joda-time:joda-time:2.10.13"
-			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.10"
+			dependency "joda-time:joda-time:2.10.10"
+			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.7"
 			dependency "org.javamoney:moneta:1.3"

 			dependency "com.sun.activation:javax.activation:1.2.0"
@@ -309,23 +296,21 @@ configure([rootProject] + javaProjects) { project ->
 	apply plugin: "java-test-fixtures"
 	apply plugin: "checkstyle"
 	apply plugin: 'org.springframework.build.compile'
-	apply from: "${rootDir}/gradle/toolchains.gradle"
+	apply from: "${rootDir}/gradle/custom-java-home.gradle"
 	apply from: "${rootDir}/gradle/ide.gradle"

 	pluginManager.withPlugin("kotlin") {
 		apply plugin: "org.jetbrains.dokka"
-		apply from: "${rootDir}/gradle/docs-dokka.gradle"
-
 		compileKotlin {
 			kotlinOptions {
-				languageVersion = "1.3"
-				apiVersion = "1.3"
-				freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings", "-Xopt-in=kotlin.RequiresOptIn"]
+				jvmTarget = "1.8"
+				freeCompilerArgs = ["-Xjsr305=strict"]
 				allWarningsAsErrors = true
 			}
 		}
 		compileTestKotlin {
 			kotlinOptions {
+				jvmTarget = "1.8"
 				freeCompilerArgs = ["-Xjsr305=strict"]
 			}
 		}
@@ -340,36 +325,35 @@ configure([rootProject] + javaProjects) { project ->
 	}

 	checkstyle {
-		toolVersion = "10.1"
-		configDirectory.set(rootProject.file("src/checkstyle"))
+		toolVersion = "8.38"
+		configDir = rootProject.file("src/checkstyle")
 	}

 	dependencies {
-		testImplementation("org.junit.jupiter:junit-jupiter-api")
-		testImplementation("org.junit.jupiter:junit-jupiter-params")
-		testImplementation("org.junit.platform:junit-platform-suite-api")
-		testImplementation("org.mockito:mockito-core")
-		testImplementation("org.mockito:mockito-junit-jupiter")
-		testImplementation("io.mockk:mockk")
-		testImplementation("org.assertj:assertj-core")
+		testCompile("org.junit.jupiter:junit-jupiter-api")
+		testCompile("org.junit.jupiter:junit-jupiter-params")
+		testCompile("org.mockito:mockito-core")
+		testCompile("org.mockito:mockito-junit-jupiter")
+		testCompile("io.mockk:mockk")
+		testCompile("org.assertj:assertj-core")
 		// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
-		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
-		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-		testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
-		testRuntimeOnly("org.apache.logging.log4j:log4j-core")
-		testRuntimeOnly("org.apache.logging.log4j:log4j-jul")
-		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
+		testRuntime("org.junit.platform:junit-platform-launcher")
+		testRuntime("org.junit.jupiter:junit-jupiter-engine")
+		testRuntime("org.apache.logging.log4j:log4j-core")
+		testRuntime("org.apache.logging.log4j:log4j-slf4j-impl")
+		testRuntime("org.apache.logging.log4j:log4j-jul")
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
-		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.31")
+		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.15")
 	}

 	ext.javadocLinks = [
 			"https://docs.oracle.com/javase/8/docs/api/",
 			"https://docs.oracle.com/javaee/7/api/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
-			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
+			"https://www.ibm.com/support/knowledgecenter/SS7JFU_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
+			"https://glassfish.java.net/nonav/docs/v3/api/",
 			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
 			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
 			"https://tiles.apache.org/tiles-request/apidocs/",
@@ -380,21 +364,9 @@ configure([rootProject] + javaProjects) { project ->
 			"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://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
-			"https://projectreactor.io/docs/test/release/api/",
-			"https://junit.org/junit4/javadoc/4.13.2/",
-			// Disabling linking to JUnit 5.8.2, since the `package-list` file no longer exists due to
-			// https://github.com/junit-team/junit5/commit/67ad4e545518b0ce2b0e7c96df31a669866d5003.
-			// "https://junit.org/junit5/docs/5.8.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/0.8.5.RELEASE/api/",
-			// The external Javadoc link for JSR 305 must come last to ensure that types from
-			// JSR 250 (such as @PostConstruct) are still supported. This is due to the fact
-			// that JSR 250 and JSR 305 both define types in javax.annotation, which results
-			// in a split package, and the javadoc tool does not support split packages
-			// across multiple external Javadoc sites.
-			"https://www.javadoc.io/doc/com.google.code.findbugs/jsr305/3.0.2/"
+			"https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
+			"https://junit.org/junit4/javadoc/4.12/",
+			"https://junit.org/junit5/docs/5.6.3/api/"
 	] as String[]
 }

@@ -405,6 +377,7 @@ configure(moduleProjects) { project ->
 configure(rootProject) {
 	description = "Spring Framework"

+	apply plugin: "groovy"
 	apply plugin: "kotlin"
 	apply plugin: "io.spring.nohttp"
 	apply plugin: 'org.springframework.build.api-diff'
@@ -8,10 +8,16 @@ They are declared in the `build.gradle` file in this folder.
 ### Compiler conventions

 The `org.springframework.build.compile` plugin applies the Java compiler conventions to the build.
+By default, the build compiles sources with Java `1.8` source and target compatibility.
+You can test a different source compatibility version on the CLI with a project property like:
+
+```
+./gradlew test -PjavaSourceVersion=11
+```

 ## Build Plugins

-### Optional dependencies
+## Optional dependencies

 The `org.springframework.build.optional-dependencies` plugin creates a new `optional`
 Gradle configuration - it adds the dependencies to the project's compile and runtime classpath
@@ -19,7 +25,7 @@ but doesn't affect the classpath of dependent projects.
 This plugin does not provide a `provided` configuration, as the native `compileOnly` and `testCompileOnly`
 configurations are preferred.

-### API Diff
+## API Diff

 This plugin uses the [Gradle JApiCmp](https://github.com/melix/japicmp-gradle-plugin) plugin
 to generate API Diff reports for each Spring Framework module. This plugin is applied once on the root
@@ -8,7 +8,8 @@ repositories {
 }

 dependencies {
-	implementation "me.champeau.gradle:japicmp-gradle-plugin:0.3.0"
+	implementation "me.champeau.gradle:japicmp-gradle-plugin:0.2.8"
+	implementation "com.google.guava:guava:28.2-jre" // required by japicmp-gradle-plugin
 }

 gradlePlugin {
@@ -0,0 +1 @@
+apply from: "../gradle/build-cache-settings.gradle"
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -20,22 +20,31 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

+import org.gradle.api.JavaVersion;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.plugins.JavaLibraryPlugin;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.compile.JavaCompile;

 /**
 * {@link Plugin} that applies conventions for compiling Java sources in Spring Framework.
+ * <p>One can override the default Java source compatibility version
+ * with a dedicated property on the CLI: {@code "./gradlew test -PjavaSourceVersion=11"}.
 *
 * @author Brian Clozel
 * @author Sam Brannen
- * @author Sebastien Deleuze
 */
 public class CompilerConventionsPlugin implements Plugin<Project> {

+	/**
+	 * The project property that can be used to switch the Java source
+	 * compatibility version for building source and test classes.
+	 */
+	public static final String JAVA_SOURCE_VERSION_PROPERTY = "javaSourceVersion";
+
+	public static final JavaVersion DEFAULT_COMPILER_VERSION = JavaVersion.VERSION_1_8;
+
 	private static final List<String> COMPILER_ARGS;

 	private static final List<String> TEST_COMPILER_ARGS;
@@ -44,8 +53,7 @@ public class CompilerConventionsPlugin implements Plugin<Project> {
 		List<String> commonCompilerArgs = Arrays.asList(
 				"-Xlint:serial", "-Xlint:cast", "-Xlint:classfile", "-Xlint:dep-ann",
 				"-Xlint:divzero", "-Xlint:empty", "-Xlint:finally", "-Xlint:overrides",
-				"-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options",
-				"-parameters"
+				"-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options"
 		);
 		COMPILER_ARGS = new ArrayList<>();
 		COMPILER_ARGS.addAll(commonCompilerArgs);
@@ -56,12 +64,12 @@ public class CompilerConventionsPlugin implements Plugin<Project> {
 		TEST_COMPILER_ARGS = new ArrayList<>();
 		TEST_COMPILER_ARGS.addAll(commonCompilerArgs);
 		TEST_COMPILER_ARGS.addAll(Arrays.asList("-Xlint:-varargs", "-Xlint:-fallthrough", "-Xlint:-rawtypes",
-				"-Xlint:-deprecation", "-Xlint:-unchecked"));
+				"-Xlint:-deprecation", "-Xlint:-unchecked", "-parameters"));
 	}

 	@Override
 	public void apply(Project project) {
-		project.getPlugins().withType(JavaLibraryPlugin.class, javaPlugin -> applyJavaCompileConventions(project));
+		project.getPlugins().withType(JavaPlugin.class, javaPlugin -> applyJavaCompileConventions(project));
 	}

 	/**
@@ -71,6 +79,15 @@ public class CompilerConventionsPlugin implements Plugin<Project> {
 	 */
 	private void applyJavaCompileConventions(Project project) {
 		JavaPluginConvention java = project.getConvention().getPlugin(JavaPluginConvention.class);
+		if (project.hasProperty(JAVA_SOURCE_VERSION_PROPERTY)) {
+			JavaVersion javaSourceVersion = JavaVersion.toVersion(project.property(JAVA_SOURCE_VERSION_PROPERTY));
+			java.setSourceCompatibility(javaSourceVersion);
+		}
+		else {
+			java.setSourceCompatibility(DEFAULT_COMPILER_VERSION);
+		}
+		java.setTargetCompatibility(DEFAULT_COMPILER_VERSION);
+
 		project.getTasks().withType(JavaCompile.class)
 				.matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_JAVA_TASK_NAME))
 				.forEach(compileTask -> {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -19,7 +19,6 @@ package org.springframework.build.optional;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.attributes.Usage;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.SourceSetContainer;
@@ -29,7 +28,7 @@ import org.gradle.plugins.ide.eclipse.model.EclipseModel;
 /**
 * A {@code Plugin} that adds support for Maven-style optional dependencies. Creates a new
 * {@code optional} configuration. The {@code optional} configuration is part of the
- * project's compile and runtime classpaths but does not affect the classpath of
+ * project's compile and runtime classpath's but does not affect the classpath of
 * dependent projects.
 *
 * @author Andy Wilkinson
@@ -44,16 +43,22 @@ public class OptionalDependenciesPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {
 		Configuration optional = project.getConfigurations().create("optional");
-		optional.setCanBeConsumed(false);
-		optional.setCanBeResolved(false);
 		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
-			SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class)
-					.getSourceSets();
+			SourceSetContainer sourceSets = project.getConvention()
+					.getPlugin(JavaPluginConvention.class).getSourceSets();
 			sourceSets.all((sourceSet) -> {
-				project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName()).extendsFrom(optional);
-				project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName()).extendsFrom(optional);
+				sourceSet.setCompileClasspath(
+						sourceSet.getCompileClasspath().plus(optional));
+				sourceSet.setRuntimeClasspath(
+						sourceSet.getRuntimeClasspath().plus(optional));
 			});
 		});
+		project.getPlugins().withType(EclipsePlugin.class, (eclipePlugin) -> {
+			project.getExtensions().getByType(EclipseModel.class)
+					.classpath((classpath) -> {
+						classpath.getPlusConfigurations().add(optional);
+					});
+		});
 	}

 }
@@ -2,7 +2,7 @@

 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-5.3.x[Spring Framework 5.3.x].
+for https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-5.2.x[Spring Framework 5.2.x].

 === Setting up your development environment

@@ -51,7 +51,7 @@ The pipeline can be deployed using the following command:

 [source]
 ----
-$ fly -t spring set-pipeline -p spring-framework-5.3.x -c ci/pipeline.yml -l ci/parameters.yml
+$ fly -t spring set-pipeline -p spring-framework-5.2.x -c ci/pipeline.yml -l ci/parameters.yml
 ----

 NOTE: This assumes that you have credhub integration configured with the appropriate secrets.
@@ -0,0 +1,8 @@
+FROM ubuntu:focal-20220302
+
+ADD setup.sh /setup.sh
+ADD get-jdk-url.sh /get-jdk-url.sh
+RUN ./setup.sh java11
+
+ENV JAVA_HOME /opt/openjdk
+ENV PATH $JAVA_HOME/bin:$PATH
@@ -1,11 +1,8 @@
-FROM ubuntu:focal-20220404
+FROM ubuntu:jammy-20230624

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
 RUN ./setup.sh java8

-ENV JAVA_HOME /opt/openjdk/java8
-ENV JDK11 /opt/openjdk/java11
-ENV JDK17 /opt/openjdk/java17
-
+ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
@@ -3,17 +3,11 @@ set -e

 case "$1" in
 	java8)
-		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz"
+		 echo "https://github.com/bell-sw/Liberica/releases/download/8u372+7/bellsoft-jdk8u372+7-linux-amd64.tar.gz"
 	;;
 	java11)
-		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1%2B1/OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz"
+		 echo "https://github.com/bell-sw/Liberica/releases/download/11.0.19%2B7/bellsoft-jdk11.0.19+7-linux-amd64.tar.gz"
 	;;
-  java17)
-		 echo "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2%2B8/OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz"
-  ;;
-  java18)
-		 echo "https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18%2B36/OpenJDK18U-jdk_x64_linux_hotspot_18_36.tar.gz"
-  ;;
  *)
 		echo $"Unknown java version"
 		exit 1
@@ -19,20 +19,13 @@ curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/
 ###########################################################
 # JAVA
 ###########################################################
+JDK_URL=$( ./get-jdk-url.sh $1 )

 mkdir -p /opt/openjdk
-pushd /opt/openjdk > /dev/null
-for jdk in java8 java11 java17
-do
-  JDK_URL=$( /get-jdk-url.sh $jdk )
-  mkdir $jdk
-  pushd $jdk > /dev/null
-  curl -L ${JDK_URL} | tar zx --strip-components=1
-  test -f bin/java
-  test -f bin/javac
-  popd > /dev/null
-done
-popd
+cd /opt/openjdk
+curl -L ${JDK_URL} | tar zx --strip-components=1
+test -f /opt/openjdk/bin/java
+test -f /opt/openjdk/bin/javac

 ###########################################################
 # GRADLE ENTERPRISE
@@ -1,9 +1,12 @@
+email-server: "smtp.svc.pivotal.io"
+email-from: "ci@spring.io"
+email-to: ["spring-framework-dev@pivotal.io"]
 github-repo: "https://github.com/spring-projects/spring-framework.git"
 github-repo-name: "spring-projects/spring-framework"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
-branch: "5.3.x"
-milestone: "5.3.x"
+branch: "5.2.x"
+milestone: "5.2.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
@@ -18,12 +18,14 @@ anchors:
    ARTIFACTORY_USERNAME: ((artifactory-username))
    ARTIFACTORY_PASSWORD: ((artifactory-password))
  build-project-task-params: &build-project-task-params
+    privileged: true
+    timeout: ((task-timeout))
+    params:
      BRANCH: ((branch))
      <<: *gradle-enterprise-task-params
  docker-resource-source: &docker-resource-source
    username: ((docker-hub-username))
    password: ((docker-hub-password))
-    tag: ((milestone))
  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!>
@@ -44,31 +46,31 @@ resource_types:
 - name: registry-image
  type: registry-image
  source:
+    <<: *docker-resource-source
    repository: concourse/registry-image-resource
-    tag: 1.5.0
+    tag: 1.7.1
 - name: artifactory-resource
  type: registry-image
  source:
+    <<: *docker-resource-source
    repository: springio/artifactory-resource
    tag: 0.0.17
 - 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:
-    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:
@@ -97,6 +99,14 @@ resources:
  source:
    <<: *docker-resource-source
    repository: ((docker-hub-organization))/spring-framework-ci
+    tag: ((milestone))
+- name: ci-image-jdk11
+  type: docker-image
+  icon: docker
+  source:
+    <<: *docker-resource-source
+    repository: ((docker-hub-organization))/spring-framework-ci-jdk11
+    tag: ((milestone))
 - name: artifactory-repo
  type: artifactory-resource
  icon: package-variant
@@ -105,14 +115,6 @@ resources:
    username: ((artifactory-username))
    password: ((artifactory-password))
    build_name: ((build-name))
- name: git-pull-request
-  type: pull-request
-  icon: source-pull
-  source:
-    access_token: ((github-ci-pull-request-token))
-    repository: ((github-repo-name))
-    base_branch: ((branch))
-    ignore_paths: ["ci/*"]
 - name: repo-status-build
  type: github-status-resource
  icon: eye-check-outline
@@ -129,14 +131,6 @@ resources:
    access_token: ((github-ci-status-token))
    branch: ((branch))
    context: jdk11-build
- name: repo-status-jdk17-build
-  type: github-status-resource
-  icon: eye-check-outline
-  source:
-    repository: ((github-repo-name))
-    access_token: ((github-ci-status-token))
-    branch: ((branch))
-    context: jdk17-build
 - name: slack-alert
  type: slack-notification
  icon: slack
@@ -169,6 +163,10 @@ jobs:
      params:
        build: ci-images-git-repo/ci/images
        dockerfile: ci-images-git-repo/ci/images/ci-image/Dockerfile
+    - put: ci-image-jdk11
+      params:
+        build: ci-images-git-repo/ci/images
+        dockerfile: ci-images-git-repo/ci/images/ci-image-jdk11/Dockerfile
 - name: build
  serial: true
  public: true
@@ -182,10 +180,7 @@ jobs:
    - task: build-project
      image: ci-image
      file: git-repo/ci/tasks/build-project.yml
-      privileged: true
-      timeout: ((task-timeout))
-      params:
-        <<: *build-project-task-params
+      <<: *build-project-task-params
    on_failure:
      do:
      - put: repo-status-build
@@ -230,7 +225,7 @@ jobs:
  serial: true
  public: true
  plan:
-  - get: ci-image
+  - get: ci-image-jdk11
  - get: git-repo
  - get: every-morning
    trigger: true
@@ -238,13 +233,9 @@ jobs:
    params: { state: "pending", commit: "git-repo" }
  - do:
    - task: check-project
-      image: ci-image
+      image: ci-image-jdk11
      file: git-repo/ci/tasks/check-project.yml
-      privileged: true
-      timeout: ((task-timeout))
-      params:
-        TEST_TOOLCHAIN: 11
-        <<: *build-project-task-params
+      <<: *build-project-task-params
    on_failure:
      do:
      - put: repo-status-jdk11-build
@@ -254,65 +245,6 @@ jobs:
          <<: *slack-fail-params
  - put: repo-status-jdk11-build
    params: { state: "success", commit: "git-repo" }
- name: jdk17-build
-  serial: true
-  public: true
-  plan:
-    - get: ci-image
-    - get: git-repo
-    - get: every-morning
-      trigger: true
-    - put: repo-status-jdk17-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: 15
-          <<: *build-project-task-params
-      on_failure:
-        do:
-          - put: repo-status-jdk17-build
-            params: { state: "failure", commit: "git-repo" }
-          - put: slack-alert
-            params:
-              <<: *slack-fail-params
-    - put: repo-status-jdk17-build
-      params: { state: "success", commit: "git-repo" }
- name: build-pull-requests
-  serial: true
-  public: true
-  plan:
-    - get: ci-image
-    - get: git-repo
-      resource: git-pull-request
-      trigger: true
-      version: every
-    - do:
-      - put: git-pull-request
-        params:
-          path: git-repo
-          status: pending
-      - task: build-pr
-        image: ci-image
-        file: git-repo/ci/tasks/build-pr.yml
-        privileged: true
-        timeout: ((task-timeout))
-        params:
-          BRANCH: ((branch))
-      on_success:
-        put: git-pull-request
-        params:
-          path: git-repo
-          status: success
-      on_failure:
-        put: git-pull-request
-        params:
-          path: git-repo
-          status: failure
 - name: stage-milestone
  serial: true
  plan:
@@ -345,7 +277,6 @@ jobs:
        download_artifacts: false
        save_build_info: true
    - task: promote
-      image: ci-image
      file: git-repo/ci/tasks/promote-version.yml
      params:
        RELEASE_TYPE: M
@@ -390,7 +321,6 @@ jobs:
        download_artifacts: false
        save_build_info: true
    - task: promote
-      image: ci-image
      file: git-repo/ci/tasks/promote-version.yml
      params:
        RELEASE_TYPE: RC
@@ -435,7 +365,6 @@ jobs:
        download_artifacts: true
        save_build_info: true
    - task: promote
-      image: ci-image
      file: git-repo/ci/tasks/promote-version.yml
      params:
        RELEASE_TYPE: RELEASE
@@ -463,10 +392,8 @@ jobs:

 groups:
 - name: "builds"
-  jobs: ["build", "jdk11-build", "jdk17-build"]
+  jobs: ["build", "jdk11-build"]
 - name: "releases"
  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"
  jobs: ["build-ci-images"]
- name: "pull-requests"
-  jobs: [ "build-pull-requests" ]
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-source $(dirname $0)/common.sh
-
-pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 check
-popd > /dev/null
@@ -4,6 +4,5 @@ set -e
 source $(dirname $0)/common.sh

 pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK11,JDK15 \
-  -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 check
 popd > /dev/null
@@ -4,9 +4,14 @@ set -e
 CONFIG_DIR=git-repo/ci/config
 version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )

+milestone=${version}
+if [[ $RELEASE_TYPE = "RELEASE" ]]; then
+	milestone=${version%.RELEASE}
+fi
+
 java -jar /github-changelog-generator.jar \
  --spring.config.location=${CONFIG_DIR}/changelog-generator.yml \
-  ${version} generated-changelog/changelog.md
+  ${milestone} generated-changelog/changelog.md

 echo ${version} > generated-changelog/version
 echo v${version} > generated-changelog/tag
@@ -6,11 +6,11 @@ CONFIG_DIR=git-repo/ci/config
 version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
 export BUILD_INFO_LOCATION=$(pwd)/artifactory-repo/build-info.json

-java -jar /opt/concourse-release-scripts.jar \
+java -jar /concourse-release-scripts.jar \
  --spring.config.location=${CONFIG_DIR}/release-scripts.yml \
  publishToCentral $RELEASE_TYPE $BUILD_INFO_LOCATION artifactory-repo || { exit 1; }

-java -jar /opt/concourse-release-scripts.jar \
+java -jar /concourse-release-scripts.jar \
  --spring.config.location=${CONFIG_DIR}/release-scripts.yml \
  promote $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; }

@@ -20,7 +20,7 @@ elif [[ $RELEASE_TYPE = "RC" ]]; then
 	stageVersion=$( get_next_rc_release $snapshotVersion)
 	nextVersion=$snapshotVersion
 elif [[ $RELEASE_TYPE = "RELEASE" ]]; then
-	stageVersion=$( get_next_release $snapshotVersion)
+	stageVersion=$( get_next_release $snapshotVersion "RELEASE")
 	nextVersion=$( bump_version_number $snapshotVersion)
 else
 	echo "Unknown release type $RELEASE_TYPE" >&2; exit 1;
@@ -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
@@ -10,8 +10,6 @@ caches:
 params:
  BRANCH:
  CI: true
-  MAIN_TOOLCHAIN:
-  TEST_TOOLCHAIN:
  GRADLE_ENTERPRISE_ACCESS_KEY:
  GRADLE_ENTERPRISE_CACHE_USERNAME:
  GRADLE_ENTERPRISE_CACHE_PASSWORD:
@@ -4,7 +4,9 @@ image_resource:
  type: registry-image
  source:
    repository: springio/github-changelog-generator
-    tag: '0.0.7'
+    tag: '0.0.8'
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
 inputs:
 - name: git-repo
 - name: artifactory-repo
@@ -1,5 +1,12 @@
 ---
 platform: linux
+image_resource:
+  type: registry-image
+  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
@@ -18,6 +18,12 @@ publishing {
 		mavenJava(MavenPublication) {
 			artifactId = 'spring-framework-bom'
 			from components.javaPlatform
+			// remove scope information from published BOM
+			pom.withXml {
+				asNode().dependencyManagement.first().dependencies.first().each {
+					it.remove(it.scope.first())
+				}
+			}
 		}
 	}
 }
@@ -1,5 +1,4 @@
-version=5.3.19
+version=5.2.26.BUILD-SNAPSHOT
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true
-kotlin.stdlib.default.dependency=false
@@ -0,0 +1,18 @@
+buildCache {
+	local {
+		enabled = true
+	}
+	remote(HttpBuildCache) {
+		enabled = true
+		url = 'https://ge.spring.io/cache/'
+		def cacheUsername = System.getenv('GRADLE_ENTERPRISE_CACHE_USERNAME')
+		def cachePassword = System.getenv('GRADLE_ENTERPRISE_CACHE_PASSWORD')
+		if (cacheUsername && cachePassword) {
+			push = true
+			credentials {
+				username = cacheUsername
+				password = cachePassword
+			}
+		}
+	}
+}
@@ -0,0 +1,16 @@
+addCustomJavaHomeMetadata()
+addCustomJavaSourceVersionMetadata()
+
+void addCustomJavaHomeMetadata() {
+	def customJavaHome = System.getProperty("customJavaHome")
+	if (customJavaHome) {
+		buildScan.value "Custom JAVA_HOME", customJavaHome
+	}
+}
+
+void addCustomJavaSourceVersionMetadata() {
+	def customJavaSourceVersion = System.getProperty("customJavaSourceVersion")
+	if (customJavaSourceVersion) {
+		buildScan.value "Custom Java Source Version", customJavaSourceVersion
+	}
+}
@@ -0,0 +1,80 @@
+// -----------------------------------------------------------------------------
+//
+// This script adds support for the following two JVM system properties
+// that control the build for alternative JDKs (i.e., a JDK other than
+// the one used to launch the Gradle process).
+//
+// - customJavaHome: absolute path to the alternate JDK installation to
+//     use to compile Java code and execute tests. This system property
+//     is also used in spring-oxm.gradle to determine whether JiBX is
+//     supported.
+//
+// - customJavaSourceVersion: Java version supplied to the `--release`
+//     command line flag to control the Java source and target
+//     compatibility version. Supported versions include 9 or higher.
+//     Do not set this system property if Java 8 should be used.
+//
+// Examples:
+//
+// ./gradlew -DcustomJavaHome=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home test
+//
+// ./gradlew --no-build-cache -DcustomJavaHome=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home test
+//
+// ./gradlew -DcustomJavaHome=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home -DcustomJavaSourceVersion=14 test
+//
+//
+// Credits: inspired by work from Marc Philipp and Stephane Nicoll
+//
+// -----------------------------------------------------------------------------
+
+import org.gradle.internal.os.OperatingSystem
+// import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
+
+def customJavaHome = System.getProperty("customJavaHome")
+
+if (customJavaHome) {
+	def customJavaHomeDir = new File(customJavaHome)
+	def customJavaSourceVersion = System.getProperty("customJavaSourceVersion")
+
+	tasks.withType(JavaCompile) {
+		logger.info("Java home for " + it.name + " task in " + project.name + ": " + customJavaHomeDir)
+		options.forkOptions.javaHome = customJavaHomeDir
+		inputs.property("customJavaHome", customJavaHome)
+		if (customJavaSourceVersion) {
+			options.compilerArgs += [ "--release", customJavaSourceVersion]
+			inputs.property("customJavaSourceVersion", customJavaSourceVersion)
+		}
+	}
+
+	tasks.withType(GroovyCompile) {
+		logger.info("Java home for " + it.name + " task in " + project.name + ": " + customJavaHomeDir)
+		options.forkOptions.javaHome = customJavaHomeDir
+		inputs.property("customJavaHome", customJavaHome)
+		if (customJavaSourceVersion) {
+			options.compilerArgs += [ "--release", customJavaSourceVersion]
+			inputs.property("customJavaSourceVersion", customJavaSourceVersion)
+		}
+	}
+
+	/*
+	tasks.withType(KotlinJvmCompile) {
+		logger.info("Java home for " + it.name + " task in " + project.name + ": " + customJavaHome)
+		kotlinOptions.jdkHome = customJavaHomeDir
+		inputs.property("customJavaHome", customJavaHome)
+	}
+	*/
+
+	tasks.withType(Test) {
+		def javaExecutable = customJavaHome + "/bin/java"
+		if (OperatingSystem.current().isWindows()) {
+			javaExecutable += ".exe"
+		}
+		logger.info("Java executable for " + it.name + " task in " + project.name + ": " + javaExecutable)
+		executable = javaExecutable
+		inputs.property("customJavaHome", customJavaHome)
+		if (customJavaSourceVersion) {
+			inputs.property("customJavaSourceVersion", customJavaSourceVersion)
+		}
+	}
+
+}
@@ -1,30 +0,0 @@
-tasks.findByName("dokkaHtmlPartial")?.configure {
-	outputDirectory.set(new File(buildDir, "docs/kdoc"))
-	dokkaSourceSets {
-		configureEach {
-			sourceRoots.setFrom(file("src/main/kotlin"))
-			classpath.from(sourceSets["main"].runtimeClasspath)
-			externalDocumentationLink {
-				url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://projectreactor.io/docs/core/release/api/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://javadoc.io/doc/org.hamcrest/hamcrest/2.1/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
-			}
-		}
-	}
-}
@@ -3,7 +3,7 @@ configurations {
 }

 dependencies {
-	asciidoctorExt("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.5.0")
+	asciidoctorExt("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.6.1")
 }

 repositories {
@@ -46,9 +46,8 @@ task api(type: Javadoc) {
 		stylesheetFile = file("src/docs/api/stylesheet.css")
 		splitIndex = true
 		links(project.ext.javadocLinks)
-		addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint
-		addBooleanOption('Xwerror', true) // fail build on Javadoc warnings
-		if (JavaVersion.current().isJava9Compatible()) {
+		addStringOption('Xdoclint:none', '-quiet')
+		if(JavaVersion.current().isJava9Compatible()) {
 			addBooleanOption('html5', true)
 		}
 	}
@@ -62,20 +61,54 @@ task api(type: Javadoc) {
 /**
 * Produce KDoc for all Spring Framework modules in "build/docs/kdoc"
 */
-pluginManager.withPlugin("kotlin") {
-	tasks.dokkaHtmlMultiModule.configure {
-		dependsOn {
-			tasks.getByName("api")
+dokka {
+	dependsOn {
+		tasks.getByName("api")
+	}
+
+	doFirst {
+		configuration {
+			classpath = moduleProjects.collect { project -> project.jar.outputs.files.getFiles() }.flatten()
+			classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
+
+			moduleProjects.findAll {
+				it.pluginManager.hasPlugin("kotlin")
+			}.each { project ->
+				def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect()
+				kotlinDirs -= project.sourceSets.main.java.srcDirs
+				kotlinDirs.each { dir ->
+					if (dir.exists()) {
+						sourceRoot {
+							path = dir.path
+						}
+					}
+				}
+			}
+		}
+	}
+
+	outputFormat = "html"
+	outputDirectory = "$buildDir/docs/kdoc"
+
+	configuration {
+		moduleName = "spring-framework"
+
+		externalDocumentationLink {
+			url = new URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/")
+			packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
+		}
+		externalDocumentationLink {
+			url = new URL("https://projectreactor.io/docs/core/release/api/")
+		}
+		externalDocumentationLink {
+			url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")
 		}
-		moduleName.set("spring-framework")
-		outputDirectory.set(project.file("$buildDir/docs/kdoc"))
 	}
 }

 task downloadResources(type: Download) {
-	def version = "0.2.5"
-	src "https://repo.spring.io/release/io/spring/docresources/" +
-			"spring-doc-resources/$version/spring-doc-resources-${version}.zip"
+	src "https://repo.spring.io/artifactory/snapshot/io/spring/docresources/" +
+		"spring-doc-resources/0.2.6-SNAPSHOT/spring-doc-resources-0.2.6-20210308.231804-2.zip"
 	dest project.file("$buildDir/docs/spring-doc-resources.zip")
 	onlyIfModified true
 	useETag "all"
@@ -87,29 +120,27 @@ task extractDocResources(type: Copy, dependsOn: downloadResources) {
 }

 asciidoctorj {
-	def docRoot = 'https://docs.spring.io'
-	def docsSpringFramework = "${docRoot}/spring-framework/docs/${project.version}"
-	version = '2.4.1'
+	modules {
+		pdf {
+			version '1.5.0-beta.8'
+		}
+	}
 	fatalWarnings ".*"
 	options doctype: 'book', eruby: 'erubis'
 	attributes([
 			icons: 'font',
 			idprefix: '',
 			idseparator: '-',
-			docinfo: 'shared,private-header', // https://docs.asciidoctor.org/asciidoctor/latest/docinfo/
+			docinfo: 'shared',
 			revnumber: project.version,
 			sectanchors: '',
 			sectnums: '',
 			'source-highlighter': 'highlight.js',
 			highlightjsdir: 'js/highlight',
-			'highlightjs-theme': 'googlecode',
+			'highlightjs-theme': 'github', // 'googlecode',
 			stylesdir: 'css/',
 			stylesheet: 'stylesheet.css',
-			'spring-version': project.version,
-			'spring-framework-main-code': 'https://github.com/spring-projects/spring-framework/tree/main',
-			'doc-root': docRoot,
-			'docs-spring-framework': docsSpringFramework,
-			'api-spring-framework': "${docsSpringFramework}/javadoc-api/org/springframework"
+			'spring-version': project.version
 	])
 }

@@ -127,7 +158,7 @@ asciidoctor {
 	logDocuments = true
 	resources {
 		from(sourceDir) {
-			include 'images/*.png', 'css/**', 'js/**'
+			include 'images/*', 'css/**', 'js/**'
 		}
 		from extractDocResources
 	}
@@ -150,7 +181,7 @@ asciidoctorPdf {
 /**
 * Zip all docs (API and reference) into a single archive
 */
-task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokkaHtmlMultiModule']) {
+task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokka']) {
 	group = "Distribution"
 	description = "Builds -${archiveClassifier} archive containing api and reference " +
 			"for deployment at https://docs.spring.io/spring-framework/docs."
@@ -164,12 +195,12 @@ task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dok
 		into "javadoc-api"
 	}
 	from ("$asciidoctor.outputDir") {
-		into "reference/html"
+		into "spring-framework-reference"
 	}
 	from ("$asciidoctorPdf.outputDir") {
-		into "reference/pdf"
+		into "spring-framework-reference/pdf"
 	}
-	from (dokkaHtmlMultiModule.outputDirectory) {
+	from (dokka) {
 		into "kdoc-api"
 	}
 }
@@ -226,11 +257,11 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
 		expand(copyright: new Date().format("yyyy"), version: project.version)
 	}

-	from(zipTree(docsZip.archiveFile)) {
+	from(zipTree(docsZip.archivePath)) {
 		into "${baseDir}/docs"
 	}

-	from(zipTree(schemaZip.archiveFile)) {
+	from(zipTree(schemaZip.archivePath)) {
 		into "${baseDir}/schema"
 	}

@@ -1,7 +1,7 @@
 import org.gradle.plugins.ide.eclipse.model.ProjectDependency
 import org.gradle.plugins.ide.eclipse.model.SourceFolder

-apply plugin: 'eclipse'
+apply plugin: "eclipse"

 eclipse.jdt {
 	sourceCompatibility = 1.8
@@ -18,71 +18,102 @@ eclipse.classpath.file.whenMerged { classpath ->
 		if (matcher) {
 			def projectName = matcher[0][1]
 			def path = "/${projectName}"
-			if (!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
-				def recursiveDependency = entry.path.matches('.+/' + projectName + '/build/([^/]+/)+(?:main|test)')
-				// Avoid recursive dependency on current project.
-				if (!recursiveDependency) {
-					classpath.entries.add(new ProjectDependency(path))
-				}
+			if(!classpath.entries.find { e -> e instanceof ProjectDependency && e.path == path }) {
+				def dependency = new ProjectDependency(path)
+				dependency.exported = true
+				classpath.entries.add(dependency)
 			}
 			classpath.entries.remove(entry)
 		}
 	}
-
-	// Remove any remaining direct depencencies on JARs in the build/libs folder
-	// except Spring's spring-cglib-repack and spring-objenesis-repack JARs.
 	classpath.entries.removeAll { entry -> (entry.path =~ /(?!.*?repack.*\.jar).*?\/([^\/]+)\/build\/libs\/[^\/]+\.jar/) }
 }

 // Use separate main/test outputs (prevents WTP from packaging test classes)
-eclipse.classpath.defaultOutputDir = file(project.name + '/bin/eclipse')
+eclipse.classpath.defaultOutputDir = file(project.name+"/bin/eclipse")
 eclipse.classpath.file.beforeMerged { classpath ->
 	classpath.entries.findAll{ it instanceof SourceFolder }.each {
-		if (it.output.startsWith('bin/')) {
+		if (it.output.startsWith("bin/")) {
 			it.output = null
 		}
 	}
 }
-eclipse.classpath.file.whenMerged {
-	entries.findAll{ it instanceof SourceFolder }.each {
-		it.output = 'bin/' + it.path.split('/')[1]
+eclipse.classpath.file.whenMerged { classpath ->
+	classpath.entries.findAll{ it instanceof SourceFolder }.each {
+		it.output = "bin/" + it.path.split("/")[1]
 	}
 }

 // Ensure project dependencies come after 3rd-party libs (SPR-11836)
 // https://jira.spring.io/browse/SPR-11836
-eclipse.classpath.file.whenMerged {
-	entries.findAll { it instanceof ProjectDependency }.each {
+eclipse.classpath.file.whenMerged { classpath ->
+	classpath.entries.findAll { it instanceof ProjectDependency }.each {
 		// delete from original position
-		entries.remove(it)
+		classpath.entries.remove(it)
 		// append to end of classpath
-		entries.add(it)
+		classpath.entries.add(it)
 	}
 }

-// Ensure that JMH sources and resources are treated as test classpath entries
-// so that they can see test fixtures.
-// https://github.com/melix/jmh-gradle-plugin/issues/157
-eclipse.classpath.file.whenMerged {
-	entries.findAll { it.path =~ /src\/jmh\/(java|resources)/ }.each {
-		it.entryAttributes['test'] = 'true'
-	}
-}
+// Allow projects to be used as WTP modules
+eclipse.project.natures "org.eclipse.wst.common.project.facet.core.nature"

 // Include project specific settings
 task eclipseSettings(type: Copy) {
 	from rootProject.files(
-		'src/eclipse/org.eclipse.jdt.core.prefs',
-		'src/eclipse/org.eclipse.jdt.ui.prefs')
+		"src/eclipse/org.eclipse.jdt.ui.prefs",
+		"src/eclipse/org.eclipse.wst.common.project.facet.core.xml")
 	into project.file('.settings/')
 	outputs.upToDateWhen { false }
 }

-task cleanEclipseSettings(type: Delete) {
-	delete project.file('.settings/org.eclipse.jdt.core.prefs')
-	delete project.file('.settings/org.eclipse.jdt.ui.prefs')
+task eclipseWstComponent(type: Copy) {
+	from rootProject.files(
+		"src/eclipse/org.eclipse.wst.common.component")
+	into project.file('.settings/')
+	expand(deployname: project.name)
+	outputs.upToDateWhen { false }
 }

-tasks['eclipse'].dependsOn(eclipseSettings)
-tasks['eclipseJdt'].dependsOn(eclipseSettings)
-tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)
+task eclipseJdtPrepare(type: Copy) {
+	from rootProject.file("src/eclipse/org.eclipse.jdt.core.prefs")
+	into project.file(".settings/")
+	outputs.upToDateWhen { false }
+}
+
+task cleanEclipseJdtUi(type: Delete) {
+	delete project.file(".settings/org.eclipse.jdt.core.prefs")
+	delete project.file(".settings/org.eclipse.jdt.ui.prefs")
+	delete project.file(".settings/org.eclipse.wst.common.component")
+	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
+}
+
+task eclipseBuildship(type: Copy) {
+	from rootProject.files(
+		"src/eclipse/org.eclipse.jdt.ui.prefs",
+		"src/eclipse/org.eclipse.jdt.core.prefs")
+	into project.file('.settings/')
+	outputs.upToDateWhen { false }
+}
+
+tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare)
+tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi)
+tasks["eclipse"].dependsOn(eclipseSettings, eclipseWstComponent)
+
+
+// Filter 'build' folder
+eclipse.project.file.withXml {
+	def node = it.asNode()
+
+	def filteredResources = node.get("filteredResources")
+	if(filteredResources) {
+		node.remove(filteredResources)
+	}
+	def filterNode = node.appendNode("filteredResources").appendNode("filter")
+	filterNode.appendNode("id", "1359048889071")
+	filterNode.appendNode("name", "")
+	filterNode.appendNode("type", "30")
+	def matcherNode = filterNode.appendNode("matcher")
+	matcherNode.appendNode("id", "org.eclipse.ui.ide.multiFilter")
+	matcherNode.appendNode("arguments", "1.0-projectRelativePath-matches-false-false-build")
+}
@@ -1,42 +1,7 @@
-apply plugin: 'java-library'
 apply plugin: 'org.springframework.build.compile'
 apply plugin: 'org.springframework.build.optional-dependencies'
-// Uncomment the following for Shadow support in the jmhJar block.
-// Currently commented out due to ZipException: archive is not a ZIP archive
-// apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'me.champeau.jmh'
 apply from: "$rootDir/gradle/publications.gradle"

-dependencies {
-	jmh 'org.openjdk.jmh:jmh-core:1.32'
-	jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.32'
-	jmh 'net.sf.jopt-simple:jopt-simple'
-}
-
-jmh {
-	duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-tasks.findByName("processJmhResources").configure {
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-jmhJar {
-	// Uncomment the following for Shadow's Transformer support.
-	// mergeServiceFiles()
-	// append('META-INF/spring.handlers')
-	// append('META-INF/spring.schemas')
-	// append('META-INF/spring.tooling')
-	exclude 'LICENSE'
-	exclude 'THIRD-PARTY'
-	exclude 'META-INF/license.txt'
-	exclude 'META-INF/notice.txt'
-	exclude 'META-INF/DEPENDENCIES'
-	exclude 'META-INF/LICENSE*'
-	exclude 'META-INF/NOTICE'
-	exclude 'META-INF/THIRD-PARTY'
-}
-
 jar {
 	manifest.attributes["Implementation-Title"] = project.name
 	manifest.attributes["Implementation-Version"] = project.version
@@ -98,5 +63,9 @@ publishing {
 }

 // Disable publication of test fixture artifacts.
-components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
-components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }
+//
+// Once we upgrade to Gradle 6.x, we will need to delete the following line ...
+components.java.variants.removeAll { it.outgoingConfiguration.name.startsWith("testFixtures") }
+// ... and uncomment the following two lines.
+// components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) { skip() }
+// components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) { skip() }
@@ -1,182 +0,0 @@
-/**
- * Apply the JVM Toolchain conventions
- * See https://docs.gradle.org/current/userguide/toolchains.html
- *
- * One can choose the toolchain to use for compiling the MAIN sources and/or compiling
- * and running the TEST sources. These options apply to Java, Kotlin and Groovy sources
- * when available.
- * {@code "./gradlew check -PmainToolchain=8 -PtestToolchain=11"} will use:
- * <ul>
- *     <li>a JDK8 toolchain for compiling the main SourceSet
- *     <li>a JDK11 toolchain for compiling and running the test SourceSet
- * </ul>
- *
- * By default, the build will fall back to using the current JDK and 1.8 language level for all sourceSets.
- *
- * Gradle will automatically detect JDK distributions in well-known locations.
- * The following command will list the detected JDKs on the host.
- * {@code
- * $ ./gradlew -q javaToolchains
- * }
- *
- * We can also configure ENV variables and let Gradle know about them:
- * {@code
- * $ echo JDK11
- * /opt/openjdk/java11
- * $ echo JDK15
- * /opt/openjdk/java15
- * $ ./gradlew -Porg.gradle.java.installations.fromEnv=JDK11,JDK15 check
- * }
- *
- * @author Brian Clozel
- * @author Sam Brannen
- */
-
-def mainToolchainConfigured() {
-	return project.hasProperty('mainToolchain') && project.mainToolchain
-}
-
-def testToolchainConfigured() {
-	return project.hasProperty('testToolchain') && project.testToolchain
-}
-
-def mainToolchainLanguageVersion() {
-	if (mainToolchainConfigured()) {
-		return JavaLanguageVersion.of(project.mainToolchain.toString())
-	}
-	return JavaLanguageVersion.of(8)
-}
-
-def testToolchainLanguageVersion() {
-	if (testToolchainConfigured()) {
-		return JavaLanguageVersion.of(project.testToolchain.toString())
-	}
-	return mainToolchainLanguageVersion()
-}
-
-plugins.withType(JavaPlugin) {
-	// Configure the Java Toolchain if the 'mainToolchain' is configured
-	if (mainToolchainConfigured()) {
-		java {
-			toolchain {
-				languageVersion = mainToolchainLanguageVersion()
-			}
-		}
-	}
-	else {
-		// Fallback to JDK8
-		java {
-			sourceCompatibility = JavaVersion.VERSION_1_8
-		}
-	}
-	// Configure a specific Java Toolchain for compiling and running tests if the 'testToolchain' property is defined
-	if (testToolchainConfigured()) {
-		def testLanguageVersion = testToolchainLanguageVersion()
-		tasks.withType(JavaCompile).matching { it.name.contains("Test") }.configureEach {
-			javaCompiler = javaToolchains.compilerFor {
-				languageVersion = testLanguageVersion
-			}
-		}
-		tasks.withType(Test).configureEach{
-			javaLauncher = javaToolchains.launcherFor {
-				languageVersion = testLanguageVersion
-			}
-		}
-	}
-}
-
-plugins.withType(GroovyPlugin) {
-	// Fallback to JDK8
-	if (!mainToolchainConfigured()) {
-		compileGroovy {
-			sourceCompatibility = JavaVersion.VERSION_1_8
-		}
-	}
-}
-
-pluginManager.withPlugin("kotlin") {
-	// Configure the Kotlin compiler if the 'mainToolchain' property is defined
-	if (mainToolchainConfigured()) {
-		def mainLanguageVersion = mainToolchainLanguageVersion()
-		def compiler = javaToolchains.compilerFor {
-			languageVersion = mainLanguageVersion
-		}
-		// See https://kotlinlang.org/docs/gradle.html#attributes-specific-for-jvm
-		def javaVersion = mainLanguageVersion.toString() == '8' ? '1.8' : mainLanguageVersion.toString()
-		compileKotlin {
-			kotlinOptions {
-				jvmTarget = javaVersion
-				jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
-			}
-		}
-		// Compile the test classes with the same version, 'testToolchain' will override if defined
-		compileTestKotlin {
-			kotlinOptions {
-				jvmTarget = javaVersion
-				jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
-			}
-		}
-	}
-	else {
-		// Fallback to JDK8
-		compileKotlin {
-			kotlinOptions {
-				jvmTarget = '1.8'
-			}
-		}
-		compileTestKotlin {
-			kotlinOptions {
-				jvmTarget = '1.8'
-			}
-		}
-	}
-
-	if (testToolchainConfigured()) {
-		def testLanguageVersion = testToolchainLanguageVersion()
-		def compiler = javaToolchains.compilerFor {
-			languageVersion = testLanguageVersion
-		}
-		// See https://kotlinlang.org/docs/gradle.html#attributes-specific-for-jvm
-		def javaVersion = testLanguageVersion.toString() == '8' ? '1.8' : testLanguageVersion.toString()
-		compileTestKotlin {
-			kotlinOptions {
-				jvmTarget = javaVersion
-				jdkHome = compiler.get().metadata.installationPath.asFile.absolutePath
-			}
-		}
-	}
-}
-
-// Configure the JMH plugin to use the toolchain for generating and running JMH bytecode
-pluginManager.withPlugin("me.champeau.jmh") {
-	if (mainToolchainConfigured() || testToolchainConfigured()) {
-		tasks.matching { it.name.contains('jmh') && it.hasProperty('javaLauncher') }.configureEach {
-			javaLauncher.set(javaToolchains.launcherFor {
-				languageVersion.set(testToolchainLanguageVersion())
-			})
-		}
-		tasks.withType(JavaCompile).matching { it.name.contains("Jmh") }.configureEach {
-			javaCompiler = javaToolchains.compilerFor {
-				languageVersion = testToolchainLanguageVersion()
-			}
-		}
-	}
-}
-
-// Store resolved Toolchain JVM information as custom values in the build scan.
-rootProject.ext {
-	resolvedMainToolchain = false
-	resolvedTestToolchain = false
-}
-gradle.taskGraph.afterTask { Task task, TaskState state ->
-	if (mainToolchainConfigured() && !resolvedMainToolchain && task instanceof JavaCompile && task.javaCompiler.isPresent()) {
-		def metadata = task.javaCompiler.get().metadata
-		task.project.buildScan.value('Main toolchain', "$metadata.vendor $metadata.languageVersion ($metadata.installationPath)")
-		resolvedMainToolchain = true
-	}
-	if (testToolchainConfigured() && !resolvedTestToolchain && task instanceof Test && task.javaLauncher.isPresent()) {
-		def metadata = task.javaLauncher.get().metadata
-		task.project.buildScan.value('Test toolchain', "$metadata.vendor $metadata.languageVersion ($metadata.installationPath)")
-		resolvedTestToolchain = true
-	}
-}
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh

 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,113 +17,78 @@
 #

 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################

 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"

 warn () {
    echo "$*"
-} >&2
+}

 die () {
    echo
    echo "$*"
    echo
    exit 1
-} >&2
+}

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +97,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD=java
+    JAVACMD="java"
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +105,84 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi

-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi

 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`

-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")

-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi

 exec "$JAVACMD" "$@"
@@ -29,9 +29,6 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@@ -40,7 +37,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +51,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +61,28 @@ echo location of your Java installation.

 goto fail

+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
@rem Setup the command line

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

-
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

 :end
@rem End local scope for the variables with windows NT shell
@@ -3,11 +3,11 @@
 This document will guide you through the process of importing the Spring Framework
 projects into Eclipse or the Spring Tool Suite (_STS_). It is recommended that you
 have a recent version of Eclipse. As a bare minimum you will need Eclipse with full Java
-8 support, Eclipse Buildship, and the Groovy plugin.
+8 support, Eclipse Buildship, the Kotlin plugin, and the Groovy plugin.

-The following instructions have been tested against [STS](https://spring.io/tools) 4.12.0
-([download](https://github.com/spring-projects/sts4/wiki/Previous-Versions#spring-tools-4120-changelog))
-(based on Eclipse 4.21) with [Eclipse Buildship](https://projects.eclipse.org/projects/tools.buildship).
+The following instructions have been tested against [STS](https://spring.io/tools) 4.3.2
+([download](https://github.com/spring-projects/sts4/wiki/Previous-Versions#spring-tools-432-changelog))
+(based on Eclipse 4.12) with [Eclipse Buildship](https://projects.eclipse.org/projects/tools.buildship).
 The instructions should work with the latest Eclipse distribution as long as you install
 [Buildship](https://marketplace.eclipse.org/content/buildship-gradle-integration). Note
 that STS 4 comes with Buildship preinstalled.
@@ -16,32 +16,28 @@ that STS 4 comes with Buildship preinstalled.

 _When instructed to execute `./gradlew` from the command line, be sure to execute it within your locally cloned `spring-framework` working directory._

-1. Install the [Groovy Development Tools](https://marketplace.eclipse.org/content/groovy-development-tools).
-1. Switch to Groovy 3.0 in Eclipse (Preferences &#8594; Groovy &#8594; Compiler &#8594; Switch to 3.0...).
-   - If you encounter build errors stating something similar to _"Groovy: compiler mismatch: project level is 2.5, workspace level is 3.0"_, change the Groovy compiler version to 3.0 for each affected project.
-1. Ensure that the _Forbidden reference (access rule)_ in Eclipse is set to `Info`
-(Preferences &#8594; Java &#8594; Compiler &#8594; Errors/Warnings &#8594; Deprecated and restricted API &#8594; Forbidden reference (access rule)).
-1. Optionally install the [Kotlin Plugin for Eclipse](https://marketplace.eclipse.org/content/kotlin-plugin-eclipse) if you need to execute Kotlin-based tests or develop Kotlin extensions.
-   - **NOTE**: As of September 21, 2021, it appears that the Kotlin Plugin for Eclipse does not yet work with Eclipse 4.21.
-1. Optionally install the [AspectJ Development Tools](https://marketplace.eclipse.org/content/aspectj-development-tools) (_AJDT_) if you need to work with the `spring-aspects` project.
-   - **NOTE**: As of September 21, 2021, it appears that the AspectJ Development Tools do not yet work with Eclipse 4.21.
-1. Optionally install the [TestNG plugin](https://testng.org/doc/eclipse.html) in Eclipse if you need to execute individual TestNG test classes or tests in the `spring-test` module.
-   - As an alternative to installing the TestNG plugin, you can execute the `org.springframework.test.context.testng.TestNGTestSuite` class as a "JUnit 5" test class in Eclipse.
+1. Ensure that Eclipse launches with JDK 8.
+   - For example, on Mac OS this can be configured in the `Info.plist` file located in the `Contents` folder of the installed Eclipse or STS application (e.g., the `Eclipse.app` file).
+1. Install the [Kotlin Plugin for Eclipse](https://marketplace.eclipse.org/content/kotlin-plugin-eclipse) in Eclipse.
+1. Install the [Eclipse Groovy Development Tools](https://github.com/groovy/groovy-eclipse/wiki) in Eclipse.
+1. Switch to Groovy 2.5 (Preferences -> Groovy -> Compiler -> Switch to 2.5...) in Eclipse.
+1. Change the _Forbidden reference (access rule)_ in Eclipse from Error to Warning
+(Preferences -> Java -> Compiler -> Errors/Warnings -> Deprecated and restricted API -> Forbidden reference (access rule)).
+1. Optionally install the [AspectJ Development Tools](https://marketplace.eclipse.org/content/aspectj-development-tools) (_AJDT_) if you need to work with the `spring-aspects` project. The AspectJ Development Tools available in the Eclipse Marketplace have been tested with these instructions using STS 4.5 (Eclipse 4.14).
+1. Optionally install the [TestNG plugin](https://testng.org/doc/eclipse.html) in Eclipse if you need to execute TestNG tests in the `spring-test` module.
 1. Build `spring-oxm` from the command line with `./gradlew :spring-oxm:check`.
-1. To apply Spring Framework specific settings, run `./gradlew cleanEclipse eclipse` from the command line.
-1. Import all projects into Eclipse (File &#8594; Import &#8594; Gradle &#8594; Existing Gradle Project &#8594; Navigate to the locally cloned `spring-framework` directory &#8594; Select Finish).
+1. To apply project specific settings, run `./gradlew eclipseBuildship` from the command line.
+1. Import into Eclipse (File -> Import -> Gradle -> Existing Gradle Project -> Navigate to the locally cloned `spring-framework` directory -> Select Finish).
   - If you have not installed AJDT, exclude the `spring-aspects` project from the import, if prompted, or close it after the import.
-   - If you run into errors during the import, you may need to set the _Java home_ for Gradle Buildship to the location of your JDK 8 installation in Eclipse (Preferences &#8594; Gradle &#8594; Java home).
-1. If you need to execute JAXB-related tests in the `spring-oxm` project and wish to have the generated sources available, add the `build/generated-sources/jaxb` folder to the build path (right click on the `jaxb` folder and select "Build Path &#8594; Use as Source Folder").
-   - If you do not see the `build` folder in the `spring-oxm` project, ensure that the "Gradle build folder" is not filtered out from the view. This setting is available under "Filters" in the configuration of the Package Explorer (available by clicking on the _three vertical dots_ in the upper right corner of the Package Explorer).
+   - If you run into errors during the import, you may need to set the _Java home_ for Gradle Buildship to the location of your JDK 8 installation in Eclipse (Preferences -> Gradle -> Java home).
+1. If you need to execute JAXB-related tests in the `spring-oxm` project and wish to have the generated sources available, add the `build/generated-sources/jaxb` folder to the build path (right click on the `jaxb` folder and select `Build Path -> Use as Source Folder`).
+   - If you do not see the `build` folder in the `spring-oxm` project, ensure that the "Gradle build folder" is not filtered out from the view. This setting is available under "Filters" in the configuration of the Package Explorer (available by clicking on the small downward facing arrow in the upper right corner of the Package Explorer).
 1. Code away!

 ## Known Issues

-1. `spring-core` should be pre-compiled due to repackaged dependencies.
-   - See `*RepackJar` tasks in the `spring-core.gradle` build file.
-1. `spring-oxm` should be pre-compiled due to JAXB types generated for tests.
-   - Note that executing `./gradlew :spring-oxm:check` as explained in the _Steps_ above will compile `spring-core` and generate JAXB types for `spring-oxm`.
+1. `spring-core` and `spring-oxm` should be pre-compiled due to repackaged dependencies.
+   - See `*RepackJar` tasks in the build.
 1. `spring-aspects` does not compile due to references to aspect types unknown to Eclipse.
   - If you installed _AJDT_ into Eclipse it should work.
 1. While JUnit tests pass from the command line with Gradle, some may fail when run from
@@ -1,26 +1,26 @@
 description = "Spring Integration Tests"

 dependencies {
-	testImplementation(project(":spring-aop"))
-	testImplementation(project(":spring-beans"))
-	testImplementation(project(":spring-context"))
-	testImplementation(project(":spring-core"))
-	testImplementation(testFixtures(project(":spring-aop")))
-	testImplementation(testFixtures(project(":spring-beans")))
-	testImplementation(testFixtures(project(":spring-core")))
-	testImplementation(testFixtures(project(":spring-tx")))
-	testImplementation(project(":spring-expression"))
-	testImplementation(project(":spring-jdbc"))
-	testImplementation(project(":spring-orm"))
-	testImplementation(project(":spring-test"))
-	testImplementation(project(":spring-tx"))
-	testImplementation(project(":spring-web"))
-	testImplementation("javax.inject:javax.inject")
-	testImplementation("javax.resource:javax.resource-api")
-	testImplementation("javax.servlet:javax.servlet-api")
-	testImplementation("org.aspectj:aspectjweaver")
-	testImplementation("org.hsqldb:hsqldb")
-	testImplementation("org.hibernate:hibernate-core")
+	testCompile(project(":spring-aop"))
+	testCompile(project(":spring-beans"))
+	testCompile(project(":spring-context"))
+	testCompile(project(":spring-core"))
+	testCompile(testFixtures(project(":spring-aop")))
+	testCompile(testFixtures(project(":spring-beans")))
+	testCompile(testFixtures(project(":spring-core")))
+	testCompile(testFixtures(project(":spring-tx")))
+	testCompile(project(":spring-expression"))
+	testCompile(project(":spring-jdbc"))
+	testCompile(project(":spring-orm"))
+	testCompile(project(":spring-test"))
+	testCompile(project(":spring-tx"))
+	testCompile(project(":spring-web"))
+	testCompile("javax.inject:javax.inject")
+	testCompile("javax.resource:javax.resource-api")
+	testCompile("javax.servlet:javax.servlet-api")
+	testCompile("org.aspectj:aspectjweaver")
+	testCompile("org.hsqldb:hsqldb")
+	testCompile("org.hibernate:hibernate-core")
 }

 normalization {
@@ -70,7 +70,7 @@ class AopNamespaceHandlerScopeIntegrationTests {
 		assertThat(singletonScoped.getName()).isEqualTo(rob);
 		singletonScoped.setName(bram);
 		assertThat(singletonScoped.getName()).isEqualTo(bram);
-		ITestBean deserialized = SerializationTestUtils.serializeAndDeserialize(singletonScoped);
+		ITestBean deserialized = (ITestBean) SerializationTestUtils.serializeAndDeserialize(singletonScoped);
 		assertThat(deserialized.getName()).isEqualTo(bram);
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -34,6 +34,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.ClassPathBeanDefinitionScanner;
 import org.springframework.context.annotation.ScopeMetadata;
+import org.springframework.context.annotation.ScopeMetadataResolver;
 import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;
@@ -306,26 +307,29 @@ class ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests {
 		GenericWebApplicationContext context = new GenericWebApplicationContext();
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(context);
 		scanner.setIncludeAnnotationConfig(false);
-		scanner.setScopeMetadataResolver(definition -> {
-			ScopeMetadata metadata = new ScopeMetadata();
-			if (definition instanceof AnnotatedBeanDefinition) {
-				AnnotatedBeanDefinition annDef = (AnnotatedBeanDefinition) definition;
-				for (String type : annDef.getMetadata().getAnnotationTypes()) {
-					if (type.equals(javax.inject.Singleton.class.getName())) {
-						metadata.setScopeName(BeanDefinition.SCOPE_SINGLETON);
-						break;
-					}
-					else if (annDef.getMetadata().getMetaAnnotationTypes(type).contains(javax.inject.Scope.class.getName())) {
-						metadata.setScopeName(type.substring(type.length() - 13, type.length() - 6).toLowerCase());
-						metadata.setScopedProxyMode(scopedProxyMode);
-						break;
-					}
-					else if (type.startsWith("javax.inject")) {
-						metadata.setScopeName(BeanDefinition.SCOPE_PROTOTYPE);
+		scanner.setScopeMetadataResolver(new ScopeMetadataResolver() {
+			@Override
+			public ScopeMetadata resolveScopeMetadata(BeanDefinition definition) {
+				ScopeMetadata metadata = new ScopeMetadata();
+				if (definition instanceof AnnotatedBeanDefinition) {
+					AnnotatedBeanDefinition annDef = (AnnotatedBeanDefinition) definition;
+					for (String type : annDef.getMetadata().getAnnotationTypes()) {
+						if (type.equals(javax.inject.Singleton.class.getName())) {
+							metadata.setScopeName(BeanDefinition.SCOPE_SINGLETON);
+							break;
+						}
+						else if (annDef.getMetadata().getMetaAnnotationTypes(type).contains(javax.inject.Scope.class.getName())) {
+							metadata.setScopeName(type.substring(type.length() - 13, type.length() - 6).toLowerCase());
+							metadata.setScopedProxyMode(scopedProxyMode);
+							break;
+						}
+						else if (type.startsWith("javax.inject")) {
+							metadata.setScopeName(BeanDefinition.SCOPE_PROTOTYPE);
+						}
 					}
 				}
+				return metadata;
 			}
-			return metadata;
 		});

 		// Scan twice in order to find errors in the bean definition compatibility check.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -40,7 +40,7 @@ import org.springframework.transaction.testfixture.CallCountingTransactionManage
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.mockito.Mockito.mock;
-import static org.springframework.core.testfixture.TestGroup.LONG_RUNNING;
+import static org.springframework.core.testfixture.TestGroup.PERFORMANCE;

 /**
 * Integration tests cornering bug SPR-8651, which revealed that @Scheduled methods may
@@ -52,7 +52,7 @@ import static org.springframework.core.testfixture.TestGroup.LONG_RUNNING;
 * @since 3.1
 */
@SuppressWarnings("resource")
-@EnabledForTestGroups(LONG_RUNNING)
+@EnabledForTestGroups(PERFORMANCE)
 class ScheduledAndTransactionalAnnotationIntegrationTests {

 	@Test
@@ -61,7 +61,7 @@ class ScheduledAndTransactionalAnnotationIntegrationTests {
 		ctx.register(Config.class, JdkProxyTxConfig.class, RepoConfigA.class);
 		assertThatExceptionOfType(BeanCreationException.class)
 			.isThrownBy(ctx::refresh)
-			.withCauseInstanceOf(IllegalStateException.class);
+			.satisfies(ex -> assertThat(ex.getRootCause()).isInstanceOf(IllegalStateException.class));
 	}

 	@Test
@@ -74,7 +74,7 @@ class ScheduledAndTransactionalAnnotationIntegrationTests {

 		MyRepository repository = ctx.getBean(MyRepository.class);
 		CallCountingTransactionManager txManager = ctx.getBean(CallCountingTransactionManager.class);
-		assertThat(AopUtils.isCglibProxy(repository)).isTrue();
+		assertThat(AopUtils.isCglibProxy(repository)).isEqualTo(true);
 		assertThat(repository.getInvocationCount()).isGreaterThan(0);
 		assertThat(txManager.commits).isGreaterThan(0);
 	}
@@ -182,7 +182,7 @@ class ScheduledAndTransactionalAnnotationIntegrationTests {
 	@Aspect
 	public static class MyAspect {

-		private final AtomicInteger count = new AtomicInteger();
+		private final AtomicInteger count = new AtomicInteger(0);

 		@org.aspectj.lang.annotation.Before("execution(* scheduled())")
 		public void checkTransaction() {
@@ -200,7 +200,7 @@ class ScheduledAndTransactionalAnnotationIntegrationTests {
 	@Repository
 	static class MyRepositoryImpl implements MyRepository {

-		private final AtomicInteger count = new AtomicInteger();
+		private final AtomicInteger count = new AtomicInteger(0);

 		@Transactional
 		@Scheduled(fixedDelay = 5)
@@ -226,7 +226,7 @@ class ScheduledAndTransactionalAnnotationIntegrationTests {
 	@Repository
 	static class MyRepositoryWithScheduledMethodImpl implements MyRepositoryWithScheduledMethod {

-		private final AtomicInteger count = new AtomicInteger();
+		private final AtomicInteger count = new AtomicInteger(0);

 		@Autowired(required = false)
 		private MyAspect myAspect;
@@ -1,15 +1,10 @@
 pluginManagement {
 	repositories {
-		mavenCentral()
 		gradlePluginPortal()
-		maven { url "https://repo.spring.io/release" }
+		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 }
-
-plugins {
-	id "com.gradle.enterprise" version "3.8.1"
-	id "io.spring.ge.conventions" version "0.0.9"
-}
+apply from: "$rootDir/gradle/build-cache-settings.gradle"

 include "spring-aop"
 include "spring-aspects"
@@ -18,6 +13,8 @@ include "spring-context"
 include "spring-context-indexer"
 include "spring-context-support"
 include "spring-core"
+include "kotlin-coroutines"
+project(':kotlin-coroutines').projectDir = file('spring-core/kotlin-coroutines')
 include "spring-expression"
 include "spring-instrument"
 include "spring-jcl"
@@ -26,7 +23,6 @@ include "spring-jms"
 include "spring-messaging"
 include "spring-orm"
 include "spring-oxm"
-include "spring-r2dbc"
 include "spring-test"
 include "spring-tx"
 include "spring-web"
@@ -40,18 +36,3 @@ rootProject.name = "spring"
 rootProject.children.each {project ->
 	project.buildFileName = "${project.name}.gradle"
 }
-
-settings.gradle.projectsLoaded {
-	gradleEnterprise {
-		buildScan {
-			File buildDir = settings.gradle.rootProject.getBuildDir()
-			buildDir.mkdirs()
-			new File(buildDir, "build-scan-uri.txt").text = "(build scan not generated)"
-			buildScanPublished { scan ->
-				if (buildDir.exists()) {
-					new File(buildDir, "build-scan-uri.txt").text = "${scan.buildScanUri}\n"
-				}
-			}
-		}
-	}
-}
@@ -1,13 +1,12 @@
 description = "Spring AOP"

 dependencies {
-	api(project(":spring-beans"))
-	api(project(":spring-core"))
+	compile(project(":spring-beans"))
+	compile(project(":spring-core"))
 	optional("org.aspectj:aspectjweaver")
 	optional("org.apache.commons:commons-pool2")
 	optional("com.jamonapi:jamon")
-	testImplementation(testFixtures(project(":spring-beans")))
-	testImplementation(testFixtures(project(":spring-core")))
-	testFixturesImplementation(testFixtures(project(":spring-beans")))
+	testCompile(testFixtures(project(":spring-beans")))
+	testCompile(testFixtures(project(":spring-core")))
 	testFixturesImplementation(testFixtures(project(":spring-core")))
 }
@@ -16,8 +16,6 @@

 package org.aopalliance.intercept;

-import javax.annotation.Nonnull;
-
 /**
 * Intercepts the construction of a new object.
 *
@@ -56,7 +54,6 @@ public interface ConstructorInterceptor extends Interceptor  {
 	 * @throws Throwable if the interceptors or the target object
 	 * throws an exception
 	 */
-	@Nonnull
 	Object construct(ConstructorInvocation invocation) throws Throwable;

 }
@@ -18,8 +18,6 @@ package org.aopalliance.intercept;

 import java.lang.reflect.Constructor;

-import javax.annotation.Nonnull;
-
 /**
 * Description of an invocation to a constructor, given to an
 * interceptor upon constructor-call.
@@ -38,7 +36,6 @@ public interface ConstructorInvocation extends Invocation {
 	 * {@link Joinpoint#getStaticPart()} method (same result).
 	 * @return the constructor being called
 	 */
-	@Nonnull
 	Constructor<?> getConstructor();

 }
@@ -16,8 +16,6 @@

 package org.aopalliance.intercept;

-import javax.annotation.Nonnull;
-
 /**
 * This interface represents an invocation in the program.
 *
@@ -34,7 +32,6 @@ public interface Invocation extends Joinpoint {
 	 * array to change the arguments.
 	 * @return the argument of the invocation
 	 */
-	@Nonnull
 	Object[] getArguments();

 }
@@ -18,9 +18,6 @@ package org.aopalliance.intercept;

 import java.lang.reflect.AccessibleObject;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 /**
 * This interface represents a generic runtime joinpoint (in the AOP
 * terminology).
@@ -49,7 +46,6 @@ public interface Joinpoint {
 	 * @return see the children interfaces' proceed definition
 	 * @throws Throwable if the joinpoint throws an exception
 	 */
-	@Nullable
 	Object proceed() throws Throwable;

 	/**
@@ -57,7 +53,6 @@ public interface Joinpoint {
 	 * <p>For instance, the target object for an invocation.
 	 * @return the object (can be null if the accessible object is static)
 	 */
-	@Nullable
 	Object getThis();

 	/**
@@ -65,7 +60,6 @@ public interface Joinpoint {
 	 * <p>The static part is an accessible object on which a chain of
 	 * interceptors are installed.
 	 */
-	@Nonnull
 	AccessibleObject getStaticPart();

 }
@@ -16,9 +16,6 @@

 package org.aopalliance.intercept;

-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 /**
 * Intercepts calls on an interface on its way to the target. These
 * are nested "on top" of the target.
@@ -55,7 +52,6 @@ public interface MethodInterceptor extends Interceptor {
 	 * @throws Throwable if the interceptors or the target object
 	 * throws an exception
 	 */
-	@Nullable
-	Object invoke(@Nonnull MethodInvocation invocation) throws Throwable;
+	Object invoke(MethodInvocation invocation) throws Throwable;

 }
@@ -18,8 +18,6 @@ package org.aopalliance.intercept;

 import java.lang.reflect.Method;

-import javax.annotation.Nonnull;
-
 /**
 * Description of an invocation to a method, given to an interceptor
 * upon method-call.
@@ -38,7 +36,6 @@ public interface MethodInvocation extends Invocation {
 	 * {@link Joinpoint#getStaticPart()} method (same result).
 	 * @return the method being called
 	 */
-	@Nonnull
 	Method getMethod();

 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -350,8 +350,17 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		return this.discoveredThrowingType;
 	}

-	private static boolean isVariableName(String name) {
-		return AspectJProxyUtils.isVariableName(name);
+	private boolean isVariableName(String name) {
+		char[] chars = name.toCharArray();
+		if (!Character.isJavaIdentifierStart(chars[0])) {
+			return false;
+		}
+		for (int i = 1; i < chars.length; i++) {
+			if (!Character.isJavaIdentifierPart(chars[i])) {
+				return false;
+			}
+		}
+		return true;
 	}


@@ -631,6 +640,7 @@ public abstract class AbstractAspectJAdvice implements Advice, AspectJPrecedence
 		}
 		try {
 			ReflectionUtils.makeAccessible(this.aspectJAdviceMethod);
+			// TODO AopUtils.invokeJoinpointUsingReflection
 			return this.aspectJAdviceMethod.invoke(this.aspectInstanceFactory.getAspectInstance(), actualArgs);
 		}
 		catch (IllegalArgumentException ex) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -470,10 +470,22 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 	 */
 	@Nullable
 	private String maybeExtractVariableName(@Nullable String candidateToken) {
-		if (AspectJProxyUtils.isVariableName(candidateToken)) {
+		if (!StringUtils.hasLength(candidateToken)) {
+			return null;
+		}
+		if (Character.isJavaIdentifierStart(candidateToken.charAt(0)) &&
+				Character.isLowerCase(candidateToken.charAt(0))) {
+			char[] tokenChars = candidateToken.toCharArray();
+			for (char tokenChar : tokenChars) {
+				if (!Character.isJavaIdentifierPart(tokenChar)) {
+					return null;
+				}
+			}
 			return candidateToken;
 		}
-		return null;
+		else {
+			return null;
+		}
 	}

 	/**
@@ -625,7 +637,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 			StringBuilder sb = new StringBuilder();
 			if (bodyStart >= 0 && bodyStart != (currentToken.length() - 1)) {
 				sb.append(currentToken.substring(bodyStart + 1));
-				sb.append(' ');
+				sb.append(" ");
 			}
 			numTokensConsumed++;
 			int currentIndex = startIndex + numTokensConsumed;
@@ -645,7 +657,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 					toAppend = toAppend.substring(1);
 				}
 				sb.append(toAppend);
-				sb.append(' ');
+				sb.append(" ");
 				currentIndex++;
 				numTokensConsumed++;
 			}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -23,7 +23,6 @@ import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

 import org.springframework.aop.AfterAdvice;
-import org.springframework.lang.Nullable;

 /**
 * Spring AOP advice wrapping an AspectJ after advice method.
@@ -43,7 +42,6 @@ public class AspectJAfterAdvice extends AbstractAspectJAdvice


 	@Override
-	@Nullable
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -23,7 +23,6 @@ import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

 import org.springframework.aop.AfterAdvice;
-import org.springframework.lang.Nullable;

 /**
 * Spring AOP advice wrapping an AspectJ after-throwing advice method.
@@ -58,7 +57,6 @@ public class AspectJAfterThrowingAdvice extends AbstractAspectJAdvice
 	}

 	@Override
-	@Nullable
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -25,7 +25,6 @@ import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.weaver.tools.JoinPointMatch;

 import org.springframework.aop.ProxyMethodInvocation;
-import org.springframework.lang.Nullable;

 /**
 * Spring AOP around advice (MethodInterceptor) that wraps
@@ -61,7 +60,6 @@ public class AspectJAroundAdvice extends AbstractAspectJAdvice implements Method
 	}

 	@Override
-	@Nullable
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		if (!(mi instanceof ProxyMethodInvocation)) {
 			throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -547,7 +547,7 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut
 		StringBuilder sb = new StringBuilder("AspectJExpressionPointcut: (");
 		for (int i = 0; i < this.pointcutParameterTypes.length; i++) {
 			sb.append(this.pointcutParameterTypes[i].getName());
-			sb.append(' ');
+			sb.append(" ");
 			sb.append(this.pointcutParameterNames[i]);
 			if ((i+1) < this.pointcutParameterTypes.length) {
 				sb.append(", ");
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -21,8 +21,6 @@ import java.util.List;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.PointcutAdvisor;
 import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
-import org.springframework.lang.Nullable;
-import org.springframework.util.StringUtils;

 /**
 * Utility methods for working with AspectJ proxies.
@@ -75,19 +73,4 @@ public abstract class AspectJProxyUtils {
 						((PointcutAdvisor) advisor).getPointcut() instanceof AspectJExpressionPointcut));
 	}

-	static boolean isVariableName(@Nullable String name) {
-		if (!StringUtils.hasLength(name)) {
-			return false;
-		}
-		if (!Character.isJavaIdentifierStart(name.charAt(0))) {
-			return false;
-		}
-		for (int i = 1; i < name.length(); i++) {
-			if (!Character.isJavaIdentifierPart(name.charAt(i))) {
-				return false;
-			}
-		}
-		return true;
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -84,13 +84,11 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 	}

 	@Override
-	@Nullable
 	public Object proceed() throws Throwable {
 		return this.methodInvocation.invocableClone().proceed();
 	}

 	@Override
-	@Nullable
 	public Object proceed(Object[] arguments) throws Throwable {
 		Assert.notNull(arguments, "Argument array passed to proceed cannot be null");
 		if (arguments.length != this.methodInvocation.getArguments().length) {
@@ -255,19 +253,19 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 			StringBuilder sb = new StringBuilder();
 			if (includeModifier) {
 				sb.append(Modifier.toString(getModifiers()));
-				sb.append(' ');
+				sb.append(" ");
 			}
 			if (includeReturnTypeAndArgs) {
 				appendType(sb, getReturnType(), useLongReturnAndArgumentTypeName);
-				sb.append(' ');
+				sb.append(" ");
 			}
 			appendType(sb, getDeclaringType(), useLongTypeName);
-			sb.append('.');
+			sb.append(".");
 			sb.append(getMethod().getName());
-			sb.append('(');
+			sb.append("(");
 			Class<?>[] parametersTypes = getParameterTypes();
 			appendTypes(sb, parametersTypes, includeReturnTypeAndArgs, useLongReturnAndArgumentTypeName);
-			sb.append(')');
+			sb.append(")");
 			return sb.toString();
 		}

@@ -278,7 +276,7 @@ public class MethodInvocationProceedingJoinPoint implements ProceedingJoinPoint,
 				for (int size = types.length, i = 0; i < size; i++) {
 					appendType(sb, types[i], useLongReturnAndArgumentTypeName);
 					if (i < size - 1) {
-						sb.append(',');
+						sb.append(",");
 					}
 				}
 			}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -34,7 +34,7 @@ import org.springframework.util.ClassUtils;
 /**
 * AspectJ-based proxy factory, allowing for programmatic building
 * of proxies which include AspectJ aspects (code style as well
- * annotation style).
+ * Java 5 annotation style).
 *
 * @author Rob Harrop
 * @author Juergen Hoeller
@@ -160,12 +160,23 @@ public class AspectJProxyFactory extends ProxyCreatorSupport {
 	}

 	/**
-	 * Get the singleton aspect instance for the supplied aspect type.
-	 * An instance is created if one cannot be found in the instance cache.
+	 * Get the singleton aspect instance for the supplied aspect type. An instance
+	 * is created if one cannot be found in the instance cache.
 	 */
 	private Object getSingletonAspectInstance(Class<?> aspectClass) {
-		return aspectCache.computeIfAbsent(aspectClass,
-				clazz -> new SimpleAspectInstanceFactory(clazz).getAspectInstance());
+		// Quick check without a lock...
+		Object instance = aspectCache.get(aspectClass);
+		if (instance == null) {
+			synchronized (aspectCache) {
+				// To be safe, check within full lock now...
+				instance = aspectCache.get(aspectClass);
+				if (instance == null) {
+					instance = new SimpleAspectInstanceFactory(aspectClass).getAspectInstance();
+					aspectCache.put(aspectClass, instance);
+				}
+			}
+		}
+		return instance;
 	}


@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -60,8 +60,8 @@ public class AspectMetadata implements Serializable {
 	private final Class<?> aspectClass;

 	/**
-	 * AspectJ reflection information.
-	 * <p>Re-resolved on deserialization since it isn't serializable itself.
+	 * AspectJ reflection information (AspectJ 5 / Java 5 specific).
+	 * Re-resolved on deserialization since it isn't serializable itself.
 	 */
 	private transient AjType<?> ajType;

@@ -51,7 +51,6 @@ import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConvertingComparator;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.util.ReflectionUtils.MethodFilter;
 import org.springframework.util.StringUtils;
 import org.springframework.util.comparator.InstanceComparator;

@@ -71,11 +70,7 @@ import org.springframework.util.comparator.InstanceComparator;
@SuppressWarnings("serial")
 public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFactory implements Serializable {

-	// Exclude @Pointcut methods
-	private static final MethodFilter adviceMethodFilter = ReflectionUtils.USER_DECLARED_METHODS
-			.and(method -> (AnnotationUtils.getAnnotation(method, Pointcut.class) == null));
-
-	private static final Comparator<Method> adviceMethodComparator;
+	private static final Comparator<Method> METHOD_COMPARATOR;

 	static {
 		// Note: although @After is ordered before @AfterReturning and @AfterThrowing,
@@ -91,7 +86,7 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 					return (ann != null ? ann.getAnnotation() : null);
 				});
 		Comparator<Method> methodNameComparator = new ConvertingComparator<>(Method::getName);
-		adviceMethodComparator = adviceKindComparator.thenComparing(methodNameComparator);
+		METHOD_COMPARATOR = adviceKindComparator.thenComparing(methodNameComparator);
 	}


@@ -165,10 +160,15 @@ public class ReflectiveAspectJAdvisorFactory extends AbstractAspectJAdvisorFacto
 	}

 	private List<Method> getAdvisorMethods(Class<?> aspectClass) {
-		List<Method> methods = new ArrayList<>();
-		ReflectionUtils.doWithMethods(aspectClass, methods::add, adviceMethodFilter);
+		final List<Method> methods = new ArrayList<>();
+		ReflectionUtils.doWithMethods(aspectClass, method -> {
+			// Exclude pointcuts
+			if (AnnotationUtils.getAnnotation(method, Pointcut.class) == null) {
+				methods.add(method);
+			}
+		}, ReflectionUtils.USER_DECLARED_METHODS);
 		if (methods.size() > 1) {
-			methods.sort(adviceMethodComparator);
+			methods.sort(METHOD_COMPARATOR);
 		}
 		return methods;
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.core.SmartClassLoader;
 import org.springframework.lang.Nullable;

 /**
@@ -90,13 +89,7 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyProcessorSu
 			}
 			proxyFactory.addAdvisor(this.advisor);
 			customizeProxyFactory(proxyFactory);
-
-			// Use original ClassLoader if bean class not locally loaded in overriding class loader
-			ClassLoader classLoader = getProxyClassLoader();
-			if (classLoader instanceof SmartClassLoader && classLoader != bean.getClass().getClassLoader()) {
-				classLoader = ((SmartClassLoader) classLoader).getOriginalClassLoader();
-			}
-			return proxyFactory.getProxy(classLoader);
+			return proxyFactory.getProxy(getProxyClassLoader());
 		}

 		// No proxy needed.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -114,15 +114,6 @@ public interface Advised extends TargetClassAware {
 	 */
 	Advisor[] getAdvisors();

-	/**
-	 * Return the number of advisors applying to this proxy.
-	 * <p>The default implementation delegates to {@code getAdvisors().length}.
-	 * @since 5.3.1
-	 */
-	default int getAdvisorCount() {
-		return getAdvisors().length;
-	}
-
 	/**
 	 * Add an advisor at the end of the advisor chain.
 	 * <p>The Advisor may be an {@link org.springframework.aop.IntroductionAdvisor},
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -95,6 +95,12 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 	 */
 	private List<Advisor> advisors = new ArrayList<>();

+	/**
+	 * Array updated on changes to the advisors list, which is easier
+	 * to manipulate internally.
+	 */
+	private Advisor[] advisorArray = new Advisor[0];
+

 	/**
 	 * No-arg constructor for use as a JavaBean.
@@ -238,12 +244,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {

 	@Override
 	public final Advisor[] getAdvisors() {
-		return this.advisors.toArray(new Advisor[0]);
-	}
-
-	@Override
-	public int getAdvisorCount() {
-		return this.advisors.size();
+		return this.advisorArray;
 	}

 	@Override
@@ -291,6 +292,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 			}
 		}

+		updateAdvisorArray();
 		adviceChanged();
 	}

@@ -337,6 +339,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 				Assert.notNull(advisor, "Advisor must not be null");
 				this.advisors.add(advisor);
 			}
+			updateAdvisorArray();
 			adviceChanged();
 		}
 	}
@@ -360,18 +363,27 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 					"Illegal position " + pos + " in advisor list with size " + this.advisors.size());
 		}
 		this.advisors.add(pos, advisor);
+		updateAdvisorArray();
 		adviceChanged();
 	}

+	/**
+	 * Bring the array up to date with the list.
+	 */
+	protected final void updateAdvisorArray() {
+		this.advisorArray = this.advisors.toArray(new Advisor[0]);
+	}
+
 	/**
 	 * Allows uncontrolled access to the {@link List} of {@link Advisor Advisors}.
-	 * <p>Use with care, and remember to {@link #adviceChanged() fire advice changed events}
-	 * when making any modifications.
+	 * <p>Use with care, and remember to {@link #updateAdvisorArray() refresh the advisor array}
+	 * and {@link #adviceChanged() fire advice changed events} when making any modifications.
 	 */
 	protected final List<Advisor> getAdvisorsInternal() {
 		return this.advisors;
 	}

+
 	@Override
 	public void addAdvice(Advice advice) throws AopConfigException {
 		int pos = this.advisors.size();
@@ -509,6 +521,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 			Assert.notNull(advisor, "Advisor must not be null");
 			this.advisors.add(advisor);
 		}
+		updateAdvisorArray();
 		adviceChanged();
 	}

@@ -521,8 +534,9 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		copy.copyFrom(this);
 		copy.targetSource = EmptyTargetSource.forClass(getTargetClass(), getTargetSource().isStatic());
 		copy.advisorChainFactory = this.advisorChainFactory;
-		copy.interfaces = new ArrayList<>(this.interfaces);
-		copy.advisors = new ArrayList<>(this.advisors);
+		copy.interfaces = this.interfaces;
+		copy.advisors = this.advisors;
+		copy.updateAdvisorArray();
 		return copy;
 	}

@@ -539,6 +553,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised {
 		this.methodCache = new ConcurrentHashMap<>(32);
 	}

+
 	@Override
 	public String toProxyConfigString() {
 		return toString();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -19,9 +19,7 @@ package org.springframework.aop.framework;
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;

 import org.springframework.aop.SpringProxy;
 import org.springframework.aop.TargetClassAware;
@@ -31,9 +29,7 @@ import org.springframework.aop.target.SingletonTargetSource;
 import org.springframework.core.DecoratingProxy;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ReflectionUtils;

 /**
 * Utility methods for AOP proxy factories.
@@ -44,16 +40,10 @@ import org.springframework.util.ReflectionUtils;
 *
 * @author Rod Johnson
 * @author Juergen Hoeller
- * @author Sam Brannen
 * @see org.springframework.aop.support.AopUtils
 */
 public abstract class AopProxyUtils {

-	// JDK 17 Class.isSealed() method available?
-	@Nullable
-	private static final Method isSealedMethod = ClassUtils.getMethodIfAvailable(Class.class, "isSealed");
-
-
 	/**
 	 * Obtain the singleton target object behind the given proxy, if any.
 	 * @param candidate the (potential) proxy to check
@@ -134,29 +124,40 @@ public abstract class AopProxyUtils {
 				if (targetClass.isInterface()) {
 					advised.setInterfaces(targetClass);
 				}
-				else if (Proxy.isProxyClass(targetClass) || ClassUtils.isLambdaClass(targetClass)) {
+				else if (Proxy.isProxyClass(targetClass)) {
 					advised.setInterfaces(targetClass.getInterfaces());
 				}
 				specifiedInterfaces = advised.getProxiedInterfaces();
 			}
 		}
-		List<Class<?>> proxiedInterfaces = new ArrayList<>(specifiedInterfaces.length + 3);
-		for (Class<?> ifc : specifiedInterfaces) {
-			// Only non-sealed interfaces are actually eligible for JDK proxying (on JDK 17)
-			if (isSealedMethod == null || Boolean.FALSE.equals(ReflectionUtils.invokeMethod(isSealedMethod, ifc))) {
-				proxiedInterfaces.add(ifc);
-			}
+		boolean addSpringProxy = !advised.isInterfaceProxied(SpringProxy.class);
+		boolean addAdvised = !advised.isOpaque() && !advised.isInterfaceProxied(Advised.class);
+		boolean addDecoratingProxy = (decoratingProxy && !advised.isInterfaceProxied(DecoratingProxy.class));
+		int nonUserIfcCount = 0;
+		if (addSpringProxy) {
+			nonUserIfcCount++;
 		}
-		if (!advised.isInterfaceProxied(SpringProxy.class)) {
-			proxiedInterfaces.add(SpringProxy.class);
+		if (addAdvised) {
+			nonUserIfcCount++;
 		}
-		if (!advised.isOpaque() && !advised.isInterfaceProxied(Advised.class)) {
-			proxiedInterfaces.add(Advised.class);
+		if (addDecoratingProxy) {
+			nonUserIfcCount++;
 		}
-		if (decoratingProxy && !advised.isInterfaceProxied(DecoratingProxy.class)) {
-			proxiedInterfaces.add(DecoratingProxy.class);
+		Class<?>[] proxiedInterfaces = new Class<?>[specifiedInterfaces.length + nonUserIfcCount];
+		System.arraycopy(specifiedInterfaces, 0, proxiedInterfaces, 0, specifiedInterfaces.length);
+		int index = specifiedInterfaces.length;
+		if (addSpringProxy) {
+			proxiedInterfaces[index] = SpringProxy.class;
+			index++;
 		}
-		return ClassUtils.toClassArray(proxiedInterfaces);
+		if (addAdvised) {
+			proxiedInterfaces[index] = Advised.class;
+			index++;
+		}
+		if (addDecoratingProxy) {
+			proxiedInterfaces[index] = DecoratingProxy.class;
+		}
+		return proxiedInterfaces;
 	}

 	/**
@@ -205,7 +206,7 @@ public abstract class AopProxyUtils {
 	 * Check equality of the advisors behind the given AdvisedSupport objects.
 	 */
 	public static boolean equalsAdvisors(AdvisedSupport a, AdvisedSupport b) {
-		return a.getAdvisorCount() == b.getAdvisorCount() && Arrays.equals(a.getAdvisors(), b.getAdvisors());
+		return Arrays.equals(a.getAdvisors(), b.getAdvisors());
 	}


@@ -21,6 +21,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -53,7 +54,6 @@ import org.springframework.core.SmartClassLoader;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;

@@ -126,7 +126,7 @@ class CglibAopProxy implements AopProxy, Serializable {
 	 */
 	public CglibAopProxy(AdvisedSupport config) throws AopConfigException {
 		Assert.notNull(config, "AdvisedSupport must not be null");
-		if (config.getAdvisorCount() == 0 && config.getTargetSource() == AdvisedSupport.EMPTY_TARGET_SOURCE) {
+		if (config.getAdvisors().length == 0 && config.getTargetSource() == AdvisedSupport.EMPTY_TARGET_SOURCE) {
 			throw new AopConfigException("No advisors and no TargetSource specified");
 		}
 		this.advised = config;
@@ -237,7 +237,7 @@ class CglibAopProxy implements AopProxy, Serializable {
 	 * validates it if not.
 	 */
 	private void validateClassIfNecessary(Class<?> proxySuperClass, @Nullable ClassLoader proxyClassLoader) {
-		if (!this.advised.isOptimize() && logger.isInfoEnabled()) {
+		if (logger.isInfoEnabled()) {
 			synchronized (validatedClasses) {
 				if (!validatedClasses.containsKey(proxySuperClass)) {
 					doValidateClass(proxySuperClass, proxyClassLoader,
@@ -326,7 +326,7 @@ class CglibAopProxy implements AopProxy, Serializable {
 		if (isStatic && isFrozen) {
 			Method[] methods = rootClass.getMethods();
 			Callback[] fixedCallbacks = new Callback[methods.length];
-			this.fixedInterceptorMap = CollectionUtils.newHashMap(methods.length);
+			this.fixedInterceptorMap = new HashMap<>(methods.length);

 			// TODO: small memory optimization here (can skip creation for methods with no advice)
 			for (int x = 0; x < methods.length; x++) {
@@ -978,11 +978,11 @@ class CglibAopProxy implements AopProxy, Serializable {
 			}
 			// Advice instance identity is unimportant to the proxy class:
 			// All that matters is type and ordering.
-			if (this.advised.getAdvisorCount() != otherAdvised.getAdvisorCount()) {
-				return false;
-			}
 			Advisor[] thisAdvisors = this.advised.getAdvisors();
 			Advisor[] thatAdvisors = otherAdvised.getAdvisors();
+			if (thisAdvisors.length != thatAdvisors.length) {
+				return false;
+			}
 			for (int i = 0; i < thisAdvisors.length; i++) {
 				Advisor thisAdvisor = thisAdvisors[i];
 				Advisor thatAdvisor = thatAdvisors[i];
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -20,8 +20,6 @@ import java.io.Serializable;
 import java.lang.reflect.Proxy;

 import org.springframework.aop.SpringProxy;
-import org.springframework.core.NativeDetector;
-import org.springframework.util.ClassUtils;

 /**
 * Default {@link AopProxyFactory} implementation, creating either a CGLIB proxy
@@ -40,8 +38,6 @@ import org.springframework.util.ClassUtils;
 *
 * @author Rod Johnson
 * @author Juergen Hoeller
- * @author Sebastien Deleuze
- * @author Sam Brannen
 * @since 12.03.2004
 * @see AdvisedSupport#setOptimize
 * @see AdvisedSupport#setProxyTargetClass
@@ -54,14 +50,13 @@ public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {

 	@Override
 	public AopProxy createAopProxy(AdvisedSupport config) throws AopConfigException {
-		if (!NativeDetector.inNativeImage() &&
-				(config.isOptimize() || config.isProxyTargetClass() || hasNoUserSuppliedProxyInterfaces(config))) {
+		if (config.isOptimize() || config.isProxyTargetClass() || hasNoUserSuppliedProxyInterfaces(config)) {
 			Class<?> targetClass = config.getTargetClass();
 			if (targetClass == null) {
 				throw new AopConfigException("TargetSource cannot determine target class: " +
 						"Either an interface or a target is required for proxy creation.");
 			}
-			if (targetClass.isInterface() || Proxy.isProxyClass(targetClass) || ClassUtils.isLambdaClass(targetClass)) {
+			if (targetClass.isInterface() || Proxy.isProxyClass(targetClass)) {
 				return new JdkDynamicAopProxy(config);
 			}
 			return new ObjenesisCglibAopProxy(config);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -57,7 +57,6 @@ import org.springframework.util.ClassUtils;
 * @author Juergen Hoeller
 * @author Rob Harrop
 * @author Dave Syer
- * @author Sergey Tsypanov
 * @see java.lang.reflect.Proxy
 * @see AdvisedSupport
 * @see ProxyFactory
@@ -83,8 +82,6 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 	/** Config used to configure this proxy. */
 	private final AdvisedSupport advised;

-	private final Class<?>[] proxiedInterfaces;
-
 	/**
 	 * Is the {@link #equals} method defined on the proxied interfaces?
 	 */
@@ -104,12 +101,10 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 	 */
 	public JdkDynamicAopProxy(AdvisedSupport config) throws AopConfigException {
 		Assert.notNull(config, "AdvisedSupport must not be null");
-		if (config.getAdvisorCount() == 0 && config.getTargetSource() == AdvisedSupport.EMPTY_TARGET_SOURCE) {
+		if (config.getAdvisors().length == 0 && config.getTargetSource() == AdvisedSupport.EMPTY_TARGET_SOURCE) {
 			throw new AopConfigException("No advisors and no TargetSource specified");
 		}
 		this.advised = config;
-		this.proxiedInterfaces = AopProxyUtils.completeProxiedInterfaces(this.advised, true);
-		findDefinedEqualsAndHashCodeMethods(this.proxiedInterfaces);
 	}


@@ -123,7 +118,9 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
 		if (logger.isTraceEnabled()) {
 			logger.trace("Creating JDK dynamic proxy: " + this.advised.getTargetSource());
 		}
-		return Proxy.newProxyInstance(classLoader, this.proxiedInterfaces, this);
+		Class<?>[] proxiedInterfaces = AopProxyUtils.completeProxiedInterfaces(this.advised, true);
+		findDefinedEqualsAndHashCodeMethods(proxiedInterfaces);
+		return Proxy.newProxyInstance(classLoader, proxiedInterfaces, this);
 	}

 	/**
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -73,9 +73,11 @@ public class ProxyConfig implements Serializable {
 	 * The exact meaning of "aggressive optimizations" will differ
 	 * between proxies, but there is usually some tradeoff.
 	 * Default is "false".
-	 * <p>With Spring's current proxy options, this flag effectively
-	 * enforces CGLIB proxies (similar to {@link #setProxyTargetClass})
-	 * but without any class validation checks (for final methods etc).
+	 * <p>For example, optimization will usually mean that advice changes won't
+	 * take effect after a proxy has been created. For this reason, optimization
+	 * is disabled by default. An optimize value of "true" may be ignored
+	 * if other settings preclude optimization: for example, if "exposeProxy"
+	 * is set to "true" and that's not compatible with the optimization.
 	 */
 	public void setOptimize(boolean optimize) {
 		this.optimize = optimize;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@

 package org.springframework.aop.framework;

-import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;

 import org.springframework.util.Assert;
@@ -34,7 +34,7 @@ public class ProxyCreatorSupport extends AdvisedSupport {

 	private AopProxyFactory aopProxyFactory;

-	private final List<AdvisedSupportListener> listeners = new ArrayList<>();
+	private final List<AdvisedSupportListener> listeners = new LinkedList<>();

 	/** Set to true when the first AOP proxy has been created. */
 	private boolean active = false;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -23,7 +23,6 @@ import org.aopalliance.intercept.MethodInvocation;

 import org.springframework.aop.AfterAdvice;
 import org.springframework.aop.AfterReturningAdvice;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
@@ -52,7 +51,6 @@ public class AfterReturningAdviceInterceptor implements MethodInterceptor, After


 	@Override
-	@Nullable
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		Object retVal = mi.proceed();
 		this.advice.afterReturning(retVal, mi.getMethod(), mi.getArguments(), mi.getThis());
@@ -23,7 +23,6 @@ import org.aopalliance.intercept.MethodInvocation;

 import org.springframework.aop.BeforeAdvice;
 import org.springframework.aop.MethodBeforeAdvice;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
@@ -52,7 +51,6 @@ public class MethodBeforeAdviceInterceptor implements MethodInterceptor, BeforeA


 	@Override
-	@Nullable
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		this.advice.before(mi.getMethod(), mi.getArguments(), mi.getThis());
 		return mi.proceed();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -25,8 +25,8 @@ import org.springframework.aop.Advisor;
 import org.springframework.aop.ThrowsAdvice;

 /**
- * Adapter to enable {@link org.springframework.aop.ThrowsAdvice} to be used
- * in the Spring AOP framework.
+ * Adapter to enable {@link org.springframework.aop.MethodBeforeAdvice}
+ * to be used in the Spring AOP framework.
 *
 * @author Rod Johnson
 * @author Juergen Hoeller
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -107,7 +107,6 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice {


 	@Override
-	@Nullable
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		try {
 			return mi.proceed();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -47,10 +47,8 @@ import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
-import org.springframework.core.SmartClassLoader;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;

 /**
@@ -86,7 +84,6 @@ import org.springframework.util.StringUtils;
 * @author Juergen Hoeller
 * @author Rod Johnson
 * @author Rob Harrop
- * @author Sam Brannen
 * @since 13.10.2003
 * @see #setInterceptorNames
 * @see #getAdvicesAndAdvisorsForBean
@@ -275,9 +272,19 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 		return null;
 	}

+	@Override
+	public boolean postProcessAfterInstantiation(Object bean, String beanName) {
+		return true;
+	}
+
 	@Override
 	public PropertyValues postProcessProperties(PropertyValues pvs, Object bean, String beanName) {
-		return pvs;  // skip postProcessPropertyValues
+		return pvs;
+	}
+
+	@Override
+	public Object postProcessBeforeInitialization(Object bean, String beanName) {
+		return bean;
 	}

 	/**
@@ -444,8 +451,8 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 		proxyFactory.copyFrom(this);

 		if (proxyFactory.isProxyTargetClass()) {
-			// Explicit handling of JDK proxy targets and lambdas (for introduction advice scenarios)
-			if (Proxy.isProxyClass(beanClass) || ClassUtils.isLambdaClass(beanClass)) {
+			// Explicit handling of JDK proxy targets (for introduction advice scenarios)
+			if (Proxy.isProxyClass(beanClass)) {
 				// Must allow for introductions; can't just set interfaces to the proxy's interfaces only.
 				for (Class<?> ifc : beanClass.getInterfaces()) {
 					proxyFactory.addInterface(ifc);
@@ -472,12 +479,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 			proxyFactory.setPreFiltered(true);
 		}

-		// Use original ClassLoader if bean class not locally loaded in overriding class loader
-		ClassLoader classLoader = getProxyClassLoader();
-		if (classLoader instanceof SmartClassLoader && classLoader != beanClass.getClassLoader()) {
-			classLoader = ((SmartClassLoader) classLoader).getOriginalClassLoader();
-		}
-		return proxyFactory.getProxy(classLoader);
+		return proxyFactory.getProxy(getProxyClassLoader());
 	}

 	/**
@@ -523,7 +525,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 		List<Object> allInterceptors = new ArrayList<>();
 		if (specificInterceptors != null) {
 			if (specificInterceptors.length > 0) {
-				// specificInterceptors may equal PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS
+				// specificInterceptors may equals PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS
 				allInterceptors.addAll(Arrays.asList(specificInterceptors));
 			}
 			if (commonInterceptors.length > 0) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -37,7 +37,6 @@ import org.springframework.util.StringUtils;
 * "interceptorNames" property.
 *
 * @author Juergen Hoeller
- * @author Sam Brannen
 * @since 10.10.2003
 * @see #setBeanNames
 * @see #isMatch
@@ -47,8 +46,6 @@ import org.springframework.util.StringUtils;
@SuppressWarnings("serial")
 public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator {

-	private static final String[] NO_ALIASES = new String[0];
-
 	@Nullable
 	private List<String> beanNames;

@@ -61,7 +58,7 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator {
 	 * FactoryBean will get proxied. This default behavior applies as of Spring 2.0.
 	 * If you intend to proxy a FactoryBean instance itself (a rare use case, but
 	 * Spring 1.2's default behavior), specify the bean name of the FactoryBean
-	 * including the factory-bean prefix "&amp;": e.g. "&amp;myFactoryBean".
+	 * including the factory-bean prefix "&": e.g. "&myFactoryBean".
 	 * @see org.springframework.beans.factory.FactoryBean
 	 * @see org.springframework.beans.factory.BeanFactory#FACTORY_BEAN_PREFIX
 	 */
@@ -75,70 +72,40 @@ public class BeanNameAutoProxyCreator extends AbstractAutoProxyCreator {


 	/**
-	 * Delegate to {@link AbstractAutoProxyCreator#getCustomTargetSource(Class, String)}
-	 * if the bean name matches one of the names in the configured list of supported
-	 * names, returning {@code null} otherwise.
-	 * @since 5.3
-	 * @see #setBeanNames(String...)
-	 */
-	@Override
-	protected TargetSource getCustomTargetSource(Class<?> beanClass, String beanName) {
-		return (isSupportedBeanName(beanClass, beanName) ?
-				super.getCustomTargetSource(beanClass, beanName) : null);
-	}
-
-	/**
-	 * Identify as a bean to proxy if the bean name matches one of the names in
-	 * the configured list of supported names.
-	 * @see #setBeanNames(String...)
+	 * Identify as bean to proxy if the bean name is in the configured list of names.
 	 */
 	@Override
 	@Nullable
 	protected Object[] getAdvicesAndAdvisorsForBean(
 			Class<?> beanClass, String beanName, @Nullable TargetSource targetSource) {

-		return (isSupportedBeanName(beanClass, beanName) ?
-				PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS : DO_NOT_PROXY);
-	}
-
-	/**
-	 * Determine if the bean name for the given bean class matches one of the names
-	 * in the configured list of supported names.
-	 * @param beanClass the class of the bean to advise
-	 * @param beanName the name of the bean
-	 * @return {@code true} if the given bean name is supported
-	 * @see #setBeanNames(String...)
-	 */
-	private boolean isSupportedBeanName(Class<?> beanClass, String beanName) {
 		if (this.beanNames != null) {
-			boolean isFactoryBean = FactoryBean.class.isAssignableFrom(beanClass);
 			for (String mappedName : this.beanNames) {
-				if (isFactoryBean) {
+				if (FactoryBean.class.isAssignableFrom(beanClass)) {
 					if (!mappedName.startsWith(BeanFactory.FACTORY_BEAN_PREFIX)) {
 						continue;
 					}
 					mappedName = mappedName.substring(BeanFactory.FACTORY_BEAN_PREFIX.length());
 				}
 				if (isMatch(beanName, mappedName)) {
-					return true;
+					return PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS;
 				}
-			}
-
-			BeanFactory beanFactory = getBeanFactory();
-			String[] aliases = (beanFactory != null ? beanFactory.getAliases(beanName) : NO_ALIASES);
-			for (String alias : aliases) {
-				for (String mappedName : this.beanNames) {
-					if (isMatch(alias, mappedName)) {
-						return true;
+				BeanFactory beanFactory = getBeanFactory();
+				if (beanFactory != null) {
+					String[] aliases = beanFactory.getAliases(beanName);
+					for (String alias : aliases) {
+						if (isMatch(alias, mappedName)) {
+							return PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS;
+						}
 					}
 				}
 			}
 		}
-		return false;
+		return DO_NOT_PROXY;
 	}

 	/**
-	 * Determine if the given bean name matches the mapped name.
+	 * Return if the given bean name matches the mapped name.
 	 * <p>The default implementation checks for "xxx*", "*xxx" and "*xxx*" matches,
 	 * as well as direct equality. Can be overridden in subclasses.
 	 * @param beanName the bean name to check
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -125,8 +125,12 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 	 */
 	protected DefaultListableBeanFactory getInternalBeanFactoryForBean(String beanName) {
 		synchronized (this.internalBeanFactories) {
-			return this.internalBeanFactories.computeIfAbsent(beanName,
-					name -> buildInternalBeanFactory(this.beanFactory));
+			DefaultListableBeanFactory internalBeanFactory = this.internalBeanFactories.get(beanName);
+			if (internalBeanFactory == null) {
+				internalBeanFactory = buildInternalBeanFactory(this.beanFactory);
+				this.internalBeanFactories.put(beanName, internalBeanFactory);
+			}
+			return internalBeanFactory;
 		}
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -23,32 +23,30 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.lang.Nullable;

 /**
- * {@code TargetSourceCreator} that enforces a {@link LazyInitTargetSource} for
- * each bean that is defined as "lazy-init". This will lead to a proxy created for
- * each of those beans, allowing to fetch a reference to such a bean without
- * actually initializing the target bean instance.
+ * TargetSourceCreator that enforces a LazyInitTargetSource for each bean
+ * that is defined as "lazy-init". This will lead to a proxy created for
+ * each of those beans, allowing to fetch a reference to such a bean
+ * without actually initializing the target bean instance.
 *
- * <p>To be registered as custom {@code TargetSourceCreator} for an auto-proxy
- * creator, in combination with custom interceptors for specific beans or for the
- * creation of lazy-init proxies only. For example, as an autodetected
+ * <p>To be registered as custom TargetSourceCreator for an auto-proxy creator,
+ * in combination with custom interceptors for specific beans or for the
+ * creation of lazy-init proxies only. For example, as autodetected
 * infrastructure bean in an XML application context definition:
 *
 * <pre class="code">
 * &lt;bean class="org.springframework.aop.framework.autoproxy.BeanNameAutoProxyCreator"&gt;
- *   &lt;property name="beanNames" value="*" /&gt; &lt;!-- apply to all beans --&gt;
 *   &lt;property name="customTargetSourceCreators"&gt;
 *     &lt;list&gt;
- *       &lt;bean class="org.springframework.aop.framework.autoproxy.target.LazyInitTargetSourceCreator" /&gt;
+ *       &lt;bean class="org.springframework.aop.framework.autoproxy.target.LazyInitTargetSourceCreator"/&gt;
 *     &lt;/list&gt;
 *   &lt;/property&gt;
 * &lt;/bean&gt;
 *
 * &lt;bean id="myLazyInitBean" class="mypackage.MyBeanClass" lazy-init="true"&gt;
- *   &lt;!-- ... --&gt;
+ *   ...
 * &lt;/bean&gt;</pre>
 *
 * @author Juergen Hoeller
- * @author Sam Brannen
 * @since 1.2
 * @see org.springframework.beans.factory.config.BeanDefinition#isLazyInit
 * @see org.springframework.aop.framework.autoproxy.AbstractAutoProxyCreator#setCustomTargetSourceCreators
@@ -25,11 +25,9 @@ import org.springframework.lang.Nullable;
 /**
 * Convenient TargetSourceCreator using bean name prefixes to create one of three
 * well-known TargetSource types:
- * <ul>
- * <li>: CommonsPool2TargetSource</li>
- * <li>% ThreadLocalTargetSource</li>
- * <li>! PrototypeTargetSource</li>
- * </ul>
+ * <li>: CommonsPool2TargetSource
+ * <li>% ThreadLocalTargetSource
+ * <li>! PrototypeTargetSource
 *
 * @author Rod Johnson
 * @author Stephane Nicoll
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -25,7 +25,6 @@ import org.apache.commons.logging.LogFactory;

 import org.springframework.aop.support.AopUtils;
 import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;

 /**
 * Base {@code MethodInterceptor} implementation for tracing.
@@ -152,7 +151,6 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser
 		}
 		else {
 			Object target = invocation.getThis();
-			Assert.state(target != null, "Target must not be null");
 			return LogFactory.getLog(getClassForLogging(target));
 		}
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -233,8 +233,7 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 				return beanFactory.getBean(TaskExecutor.class);
 			}
 			catch (NoUniqueBeanDefinitionException ex) {
-				logger.debug("Could not find unique TaskExecutor bean. " +
-						"Continuing search for an Executor bean named 'taskExecutor'", ex);
+				logger.debug("Could not find unique TaskExecutor bean", ex);
 				try {
 					return beanFactory.getBean(DEFAULT_TASK_EXECUTOR_BEAN_NAME, Executor.class);
 				}
@@ -247,8 +246,7 @@ public abstract class AsyncExecutionAspectSupport implements BeanFactoryAware {
 				}
 			}
 			catch (NoSuchBeanDefinitionException ex) {
-				logger.debug("Could not find default TaskExecutor bean. " +
-						"Continuing search for an Executor bean named 'taskExecutor'", ex);
+				logger.debug("Could not find default TaskExecutor bean", ex);
 				try {
 					return beanFactory.getBean(DEFAULT_TASK_EXECUTOR_BEAN_NAME, Executor.class);
 				}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -21,7 +21,6 @@ import java.io.Serializable;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

-import org.springframework.lang.Nullable;
 import org.springframework.util.ConcurrencyThrottleSupport;

 /**
@@ -49,7 +48,6 @@ public class ConcurrencyThrottleInterceptor extends ConcurrencyThrottleSupport
 	}

 	@Override
-	@Nullable
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		beforeAccess();
 		try {
@@ -296,8 +296,6 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 			@Nullable Object returnValue, @Nullable Throwable throwable, long invocationTime) {

 		Matcher matcher = PATTERN.matcher(message);
-		Object target = methodInvocation.getThis();
-		Assert.state(target != null, "Target must not be null");

 		StringBuffer output = new StringBuffer();
 		while (matcher.find()) {
@@ -306,11 +304,11 @@ public class CustomizableTraceInterceptor extends AbstractTraceInterceptor {
 				matcher.appendReplacement(output, Matcher.quoteReplacement(methodInvocation.getMethod().getName()));
 			}
 			else if (PLACEHOLDER_TARGET_CLASS_NAME.equals(match)) {
-				String className = getClassForLogging(target).getName();
+				String className = getClassForLogging(methodInvocation.getThis()).getName();
 				matcher.appendReplacement(output, Matcher.quoteReplacement(className));
 			}
 			else if (PLACEHOLDER_TARGET_CLASS_SHORT_NAME.equals(match)) {
-				String shortName = ClassUtils.getShortName(getClassForLogging(target));
+				String shortName = ClassUtils.getShortName(getClassForLogging(methodInvocation.getThis()));
 				matcher.appendReplacement(output, Matcher.quoteReplacement(shortName));
 			}
 			else if (PLACEHOLDER_ARGUMENTS.equals(match)) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2012 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.
@@ -18,8 +18,6 @@ package org.springframework.aop.interceptor;

 import org.aopalliance.intercept.MethodInvocation;

-import org.springframework.lang.Nullable;
-
 /**
 * AOP Alliance {@code MethodInterceptor} that can be introduced in a chain
 * to display verbose information about intercepted invocations to the logger.
@@ -58,7 +56,6 @@ public class DebugInterceptor extends SimpleTraceInterceptor {


 	@Override
-	@Nullable
 	public Object invoke(MethodInvocation invocation) throws Throwable {
 		synchronized (this) {
 			this.count++;
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -25,7 +25,6 @@ import org.springframework.aop.support.DefaultIntroductionAdvisor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.DelegatingIntroductionInterceptor;
 import org.springframework.beans.factory.NamedBean;
-import org.springframework.lang.Nullable;

 /**
 * Convenient methods for creating advisors that may be used when autoproxying beans
@@ -111,7 +110,6 @@ public abstract class ExposeBeanNameAdvisors {
 		}

 		@Override
-		@Nullable
 		public Object invoke(MethodInvocation mi) throws Throwable {
 			if (!(mi instanceof ProxyMethodInvocation)) {
 				throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
@@ -136,7 +134,6 @@ public abstract class ExposeBeanNameAdvisors {
 		}

 		@Override
-		@Nullable
 		public Object invoke(MethodInvocation mi) throws Throwable {
 			if (!(mi instanceof ProxyMethodInvocation)) {
 				throw new IllegalStateException("MethodInvocation is not a Spring ProxyMethodInvocation: " + mi);
@@ -25,7 +25,6 @@ import org.springframework.aop.Advisor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.core.NamedThreadLocal;
 import org.springframework.core.PriorityOrdered;
-import org.springframework.lang.Nullable;

 /**
 * Interceptor that exposes the current {@link org.aopalliance.intercept.MethodInvocation}
@@ -89,7 +88,6 @@ public final class ExposeInvocationInterceptor implements MethodInterceptor, Pri
 	}

 	@Override
-	@Nullable
 	public Object invoke(MethodInvocation mi) throws Throwable {
 		MethodInvocation oldInvocation = invocation.get();
 		invocation.set(mi);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -19,8 +19,6 @@ package org.springframework.aop.interceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.apache.commons.logging.Log;

-import org.springframework.util.Assert;
-
 /**
 * Simple AOP Alliance {@code MethodInterceptor} that can be introduced
 * in a chain to display verbose trace information about intercepted method
@@ -75,9 +73,7 @@ public class SimpleTraceInterceptor extends AbstractTraceInterceptor {
 	 * @return the description
 	 */
 	protected String getInvocationDescription(MethodInvocation invocation) {
-		Object target = invocation.getThis();
-		Assert.state(target != null, "Target must not be null");
-		String className = target.getClass().getName();
+		String className = invocation.getThis().getClass().getName();
 		return "method '" + invocation.getMethod().getName() + "' of class [" + className + "]";
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -137,7 +137,7 @@ public abstract class AbstractBeanFactoryPointcutAdvisor extends AbstractPointcu
 		StringBuilder sb = new StringBuilder(getClass().getName());
 		sb.append(": advice ");
 		if (this.adviceBeanName != null) {
-			sb.append("bean '").append(this.adviceBeanName).append('\'');
+			sb.append("bean '").append(this.adviceBeanName).append("'");
 		}
 		else {
 			sb.append(this.advice);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -183,8 +183,8 @@ public abstract class AopUtils {
 	 * may be {@code DefaultFoo}. In this case, the method may be
 	 * {@code DefaultFoo.bar()}. This enables attributes on that method to be found.
 	 * <p><b>NOTE:</b> In contrast to {@link org.springframework.util.ClassUtils#getMostSpecificMethod},
-	 * this method resolves bridge methods in order to retrieve attributes from
-	 * the <i>original</i> method definition.
+	 * this method resolves Java 5 bridge methods in order to retrieve attributes
+	 * from the <i>original</i> method definition.
 	 * @param method the method to be invoked, which may come from an interface
 	 * @param targetClass the target class for the current invocation.
 	 * May be {@code null} or may not even implement the method.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -45,7 +45,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 	@Nullable
 	private final String methodName;

-	private final AtomicInteger evaluations = new AtomicInteger();
+	private final AtomicInteger evaluations = new AtomicInteger(0);


 	/**
@@ -146,7 +146,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher

 	@Override
 	public String toString() {
-		return getClass().getName() + ": class = " + this.clazz.getName() + "; methodName = " + this.methodName;
+		return getClass().getName() + ": class = " + this.clazz.getName() + "; methodName = " + methodName;
 	}

 }
@@ -114,13 +114,12 @@ public class DelegatePerTargetObjectIntroductionInterceptor extends Introduction
 	 * that it is introduced into. This method is <strong>never</strong> called for
 	 * {@link MethodInvocation MethodInvocations} on the introduced interfaces.
 	 */
-	@Nullable
 	protected Object doProceed(MethodInvocation mi) throws Throwable {
 		// If we get here, just pass the invocation on.
 		return mi.proceed();
 	}

-	private Object getIntroductionDelegateFor(@Nullable Object targetObject) {
+	private Object getIntroductionDelegateFor(Object targetObject) {
 		synchronized (this.delegateMap) {
 			if (this.delegateMap.containsKey(targetObject)) {
 				return this.delegateMap.get(targetObject);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -131,7 +131,6 @@ public class DelegatingIntroductionInterceptor extends IntroductionInfoSupport
 	 * that it is introduced into. This method is <strong>never</strong> called for
 	 * {@link MethodInvocation MethodInvocations} on the introduced interfaces.
 	 */
-	@Nullable
 	protected Object doProceed(MethodInvocation mi) throws Throwable {
 		// If we get here, just pass the invocation on.
 		return mi.proceed();
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,7 +24,8 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
- * Simple ClassFilter that looks for a specific annotation being present on a class.
+ * Simple ClassFilter that looks for a specific Java 5 annotation
+ * being present on a class.
 *
 * @author Juergen Hoeller
 * @since 2.0
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -26,8 +26,9 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
- * Simple {@link Pointcut} that looks for a specific annotation being present on a
- * {@linkplain #forClassAnnotation class} or {@linkplain #forMethodAnnotation method}.
+ * Simple Pointcut that looks for a specific Java 5 annotation
+ * being present on a {@link #forClassAnnotation class} or
+ * {@link #forMethodAnnotation method}.
 *
 * @author Juergen Hoeller
 * @author Sam Brannen
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -27,10 +27,9 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;

 /**
- * Simple {@link org.springframework.aop.MethodMatcher MethodMatcher} that looks
- * for a specific annotation being present on a method (checking both the method
- * on the invoked interface, if any, and the corresponding method on the target
- * class).
+ * Simple MethodMatcher that looks for a specific Java 5 annotation
+ * being present on a method (checking both the method on the invoked
+ * interface, if any, and the corresponding method on the target class).
 *
 * @author Juergen Hoeller
 * @author Sam Brannen
@@ -191,9 +191,9 @@ public abstract class AbstractBeanFactoryBasedTargetSource implements TargetSour
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder(getClass().getSimpleName());
-		sb.append(" for target bean '").append(this.targetBeanName).append('\'');
+		sb.append(" for target bean '").append(this.targetBeanName).append("'");
 		if (this.targetClass != null) {
-			sb.append(" of type [").append(this.targetClass.getName()).append(']');
+			sb.append(" of type [").append(this.targetClass.getName()).append("]");
 		}
 		return sb.toString();
 	}
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`apply from: "../gradle/build-cache-settings.gradle"`