Release v5.3.10

Closes gh-27402

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,5 @@
 <!--
-!!! For Security Vulnerabilities, please go to https://pivotal.io/security !!!
+!!! For Security Vulnerabilities, please go to https://spring.io/security-policy !!!
 -->
 **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.
--->
+-->

.gitignore

@@ -41,3 +41,6 @@ out
 test-output
 atlassian-ide-plugin.xml
 .gradletasknamecache
+
+# VS Code
+.vscode/

CONTRIBUTING.md

@@ -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 `master` branch and submit pull requests against it
+1. Always check out the `main` 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,10 +125,7 @@ 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/asciidoc/html5/index.html`.
+`build/docs/ref-docs/html5/index.html`.
 
-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`.
+Asciidoctor also supports live editing. For more details see
+[AsciiDoc Tooling](https://docs.asciidoctor.org/asciidoctor/latest/tooling/).

README.md

@@ -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")
+# <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)
 
 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". 
 
@@ -25,6 +25,10 @@ See the [Micro-Benchmarks](https://github.com/spring-projects/spring-framework/w
 
 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).

build.gradle

@@ -1,15 +1,17 @@
 plugins {
-	id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
-	id 'io.spring.nohttp' version '0.0.5.RELEASE'
-	id 'org.jetbrains.kotlin.jvm' version '1.4.21' apply false
-	id 'org.jetbrains.dokka' version '0.10.1' apply false
-	id 'org.asciidoctor.jvm.convert' version '3.1.0'
-	id 'org.asciidoctor.jvm.pdf' version '3.1.0'
-	id 'de.undercouch.download' version '4.1.1'
-	id "io.freefair.aspectj" version '5.1.1' apply false
-	id "com.github.ben-manes.versions" version '0.28.0'
-	id "me.champeau.gradle.jmh" version "0.5.0" apply false
-	id "org.jetbrains.kotlin.plugin.serialization" version "1.4.21" apply false
+	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
+	id 'io.spring.nohttp' version '0.0.10'
+	id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
+	id 'org.jetbrains.dokka' version '1.5.0' apply false
+	id 'org.asciidoctor.jvm.convert' version '3.3.2'
+	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
+	id 'de.undercouch.download' version '4.1.2'
+	id "io.freefair.aspectj" version '6.1.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 "me.champeau.jmh" version "0.6.6" apply false
+	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.30" apply false
+	id "org.unbroken-dome.xjc" version '2.0.0' apply false
 }
 
 ext {
@@ -25,18 +27,19 @@ configure(allprojects) { project ->
 
 	dependencyManagement {
 		imports {
-			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.0"
-			mavenBom "io.netty:netty-bom:4.1.54.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.2"
-			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR8"
-			mavenBom "io.rsocket:rsocket-bom:1.1.0"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.35.v20201120"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.4.21"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.4.2"
-			mavenBom "org.junit:junit-bom:5.7.0"
+			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
+			mavenBom "io.netty:netty-bom:4.1.68.Final"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.11"
+			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
+			mavenBom "io.rsocket:rsocket-bom:1.1.1"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.43.v20210629"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.30"
+			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.0"
 		}
 		dependencies {
-			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.0') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.1') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-jul'
@@ -48,12 +51,12 @@ configure(allprojects) { project ->
 			}
 			dependency "com.google.code.findbugs:jsr305:3.0.2"
 
-			dependencySet(group: 'org.aspectj', version: '1.9.6') {
+			dependencySet(group: 'org.aspectj', version: '1.9.7') {
 				entry 'aspectjrt'
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
 			}
-			dependencySet(group: 'org.codehaus.groovy', version: '3.0.7') {
+			dependencySet(group: 'org.codehaus.groovy', version: '3.0.8') {
 				entry 'groovy'
 				entry 'groovy-jsr223'
 				entry 'groovy-templates'  // requires findbugs for warning-free compilation
@@ -63,23 +66,24 @@ 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.19"
-			dependency "io.reactivex.rxjava3:rxjava:3.0.8"
+			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
+			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
+			dependency "io.smallrye.reactive:mutiny:1.0.0"
 			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"
 
 			dependency "com.caucho:hessian:4.0.63"
-			dependency "com.fasterxml:aalto-xml:1.2.2"
-			dependency("com.fasterxml.woodstox:woodstox-core:6.2.3") {
+			dependency "com.fasterxml:aalto-xml:1.3.0"
+			dependency("com.fasterxml.woodstox:woodstox-core:6.2.6") {
 				exclude group: "stax", name: "stax-api"
 			}
-			dependency "com.google.code.gson:gson:2.8.6"
-			dependency "com.google.protobuf:protobuf-java-util:3.14.0"
+			dependency "com.google.code.gson:gson:2.8.8"
+			dependency "com.google.protobuf:protobuf-java-util:3.17.3"
 			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
-			dependency("com.thoughtworks.xstream:xstream:1.4.14") {
+			dependency("com.thoughtworks.xstream:xstream:1.4.18") {
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.apache.johnzon:johnzon-jsonb:1.2.8"
+			dependency "org.apache.johnzon:johnzon-jsonb:1.2.10"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
@@ -88,20 +92,16 @@ configure(allprojects) { project ->
 				entry 'jibx-run'
 			}
 			dependency "org.ogce:xpp3:1.1.6"
-			dependency "org.yaml:snakeyaml:1.27"
-			dependencySet(group: 'org.jetbrains.kotlinx', version: '1.0.0') {
-				entry 'kotlinx-serialization-core'
-				entry 'kotlinx-serialization-json'
-			}
+			dependency "org.yaml:snakeyaml:1.29"
 
 			dependency "com.h2database:h2:1.4.200"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.8.6"
-			dependency "com.github.librepdf:openpdf:1.3.23"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.9.1"
+			dependency "com.github.librepdf:openpdf:1.3.26"
 			dependency "com.rometools:rome:1.15.0"
 			dependency "commons-io:commons-io:2.5"
 			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.0') {
+			dependencySet(group: 'org.apache.activemq', version: '5.16.2') {
 				entry 'activemq-broker'
 				entry('activemq-kahadb-store') {
 					exclude group: "org.springframework", name: "spring-context"
@@ -116,30 +116,30 @@ configure(allprojects) { project ->
 			}
 			dependency "org.apache.poi:poi-ooxml:4.1.2"
 			dependency "org.apache-extras.beanshell:bsh:2.0b6"
-			dependency "org.freemarker:freemarker:2.3.30"
-			dependency "org.hsqldb:hsqldb:2.5.1"
+			dependency "org.freemarker:freemarker:2.3.31"
+			dependency "org.hsqldb:hsqldb:2.5.2"
 			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.25.Final"
-			dependency "org.hibernate:hibernate-validator:6.1.6.Final"
-			dependency "org.webjars:webjars-locator-core:0.46"
+			dependency "org.hibernate:hibernate-core:5.4.32.Final"
+			dependency "org.hibernate:hibernate-validator:6.2.0.Final"
+			dependency "org.webjars:webjars-locator-core:0.47"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.40') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.52') {
 				entry 'tomcat-util'
 				entry('tomcat-websocket') {
 					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.40') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.52') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.3.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.10.Final') {
 				entry 'undertow-core'
 				entry('undertow-websockets-jsr') {
 					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
@@ -160,11 +160,11 @@ configure(allprojects) { project ->
 			dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency 'org.apache.httpcomponents.client5:httpclient5:5.0.3'
-			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.0.3'
-			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.4"
+			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1'
+			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.1'
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.9"
 
-			dependency "org.jruby:jruby:9.2.13.0"
+			dependency "org.jruby:jruby:9.2.19.0"
 			dependency "org.python:jython-standalone:2.7.1"
 			dependency "org.mozilla:rhino:1.7.11"
 
@@ -181,34 +181,34 @@ configure(allprojects) { project ->
 				exclude group: "dom4j", name: "dom4j"
 			}
 
-			dependency("junit:junit:4.13.1") {
+			dependency("junit:junit:4.13.2") {
 				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.3.0"
+			dependency "org.testng:testng:7.4.0"
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
-			dependency "org.assertj:assertj-core:3.18.1"
-			dependencySet(group: 'org.xmlunit', version: '2.6.2') {
+			dependency "org.assertj:assertj-core:3.20.2"
+			dependencySet(group: 'org.xmlunit', version: '2.8.2') {
 				entry 'xmlunit-assertj'
 				entry('xmlunit-matchers') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '3.6.28') {
+			dependencySet(group: 'org.mockito', version: '3.12.4') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 				entry 'mockito-junit-jupiter'
 			}
-			dependency "io.mockk:mockk:1.10.2"
+			dependency "io.mockk:mockk:1.12.0"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.45.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.52.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.45.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.52.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {
@@ -216,7 +216,7 @@ configure(allprojects) { project ->
 				exclude group: "io.netty", name: "netty"
 			}
 			dependency "org.skyscreamer:jsonassert:1.5.0"
-			dependency "com.jayway.jsonpath:json-path:2.4.0"
+			dependency "com.jayway.jsonpath:json-path:2.6.0"
 			dependency "org.bouncycastle:bcpkix-jdk15on:1.66"
 
 			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {
@@ -236,8 +236,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.6"
-			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.7"
+			dependency "joda-time:joda-time:2.10.10"
+			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.9"
 			dependency "org.javamoney:moneta:1.3"
 
 			dependency "com.sun.activation:javax.activation:1.2.0"
@@ -308,23 +308,23 @@ configure([rootProject] + javaProjects) { project ->
 	apply plugin: "java-test-fixtures"
 	apply plugin: "checkstyle"
 	apply plugin: 'org.springframework.build.compile'
-	apply from: "${rootDir}/gradle/custom-java-home.gradle"
+	apply from: "${rootDir}/gradle/toolchains.gradle"
 	apply from: "${rootDir}/gradle/ide.gradle"
 
 	pluginManager.withPlugin("kotlin") {
 		apply plugin: "org.jetbrains.dokka"
+		apply from: "${rootDir}/gradle/docs-dokka.gradle"
+
 		compileKotlin {
 			kotlinOptions {
-				jvmTarget = "1.8"
 				languageVersion = "1.3"
 				apiVersion = "1.3"
-				freeCompilerArgs = ["-Xjsr305=strict"]
+				freeCompilerArgs = ["-Xjsr305=strict", "-Xsuppress-version-warnings", "-Xopt-in=kotlin.RequiresOptIn"]
 				allWarningsAsErrors = true
 			}
 		}
 		compileTestKotlin {
 			kotlinOptions {
-				jvmTarget = "1.8"
 				freeCompilerArgs = ["-Xjsr305=strict"]
 			}
 		}
@@ -339,23 +339,25 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "8.38"
+		toolVersion = "8.45.1"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 
 	dependencies {
-		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")
+		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")
 		// Pull in the latest JUnit 5 Launcher API to ensure proper support in IDEs.
-		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")
+		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+		testRuntimeOnly("org.junit.platform:junit-platform-suite-engine")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-core")
+		testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
+		testRuntimeOnly("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")
@@ -366,7 +368,7 @@ configure([rootProject] + javaProjects) { project ->
 			"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/support/knowledgecenter/SS7JFU_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
+			"https://www.ibm.com/docs/api/v1/content/SSEQTP_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/",
@@ -378,10 +380,13 @@ 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-ga/httpclient/apidocs/",
+			"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.1/",
-			"https://junit.org/junit5/docs/5.7.0/api/"
+			"https://junit.org/junit4/javadoc/4.13.2/",
+			"https://junit.org/junit5/docs/5.8.0/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/"
 	] as String[]
 }
 

buildSrc/README.md

@@ -8,16 +8,10 @@ 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
@@ -25,7 +19,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

buildSrc/src/main/java/org/springframework/build/compile/CompilerConventionsPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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,31 +20,22 @@ 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;
@@ -53,7 +44,8 @@ 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"
+				"-Xlint:path", "-Xlint:processing", "-Xlint:static", "-Xlint:try", "-Xlint:-options",
+				"-parameters"
 		);
 		COMPILER_ARGS = new ArrayList<>();
 		COMPILER_ARGS.addAll(commonCompilerArgs);
@@ -64,12 +56,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", "-parameters"));
+				"-Xlint:-deprecation", "-Xlint:-unchecked"));
 	}
 
 	@Override
 	public void apply(Project project) {
-		project.getPlugins().withType(JavaPlugin.class, javaPlugin -> applyJavaCompileConventions(project));
+		project.getPlugins().withType(JavaLibraryPlugin.class, javaPlugin -> applyJavaCompileConventions(project));
 	}
 
 	/**
@@ -79,15 +71,6 @@ 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 -> {

buildSrc/src/main/java/org/springframework/build/optional/OptionalDependenciesPlugin.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -19,6 +19,7 @@ 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;
@@ -28,7 +29,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 classpath's but does not affect the classpath of
+ * project's compile and runtime classpaths but does not affect the classpath of
  * dependent projects.
  *
  * @author Andy Wilkinson
@@ -43,22 +44,16 @@ 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) -> {
-				sourceSet.setCompileClasspath(
-						sourceSet.getCompileClasspath().plus(optional));
-				sourceSet.setRuntimeClasspath(
-						sourceSet.getRuntimeClasspath().plus(optional));
+				project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName()).extendsFrom(optional);
+				project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName()).extendsFrom(optional);
 			});
 		});
-		project.getPlugins().withType(EclipsePlugin.class, (eclipePlugin) -> {
-			project.getExtensions().getByType(EclipseModel.class)
-					.classpath((classpath) -> {
-						classpath.getPlusConfigurations().add(optional);
-					});
-		});
 	}
 
 }

ci/README.adoc

@@ -1,7 +1,8 @@
 == Spring Framework Concourse pipeline
 
-The Spring Framework is using 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.
+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].
 
 === Setting up your development environment
 
@@ -25,13 +26,17 @@ spring                https://ci.spring.io  spring-framework      Wed, 25 Mar 20
 ----
 
 === Pipeline configuration and structure
+
 The build pipelines are described in `pipeline.yml` file.
+
 This file is listing Concourse resources, i.e. build inputs and outputs such as container images, artifact repositories, source repositories, notification services, etc.
+
 It also describes jobs (a job is a sequence of inputs, tasks and outputs); jobs are organized by groups.
 
 The `pipeline.yml` definition contains `((parameters))` which are loaded from the `parameters.yml` file or from our https://docs.cloudfoundry.org/credhub/[credhub instance].
 
 You'll find in this folder the following resources:
+
 * `pipeline.yml` the build pipeline
 * `parameters.yml` the build parameters used for the pipeline
 * `images/` holds the container images definitions used in this pipeline
@@ -41,6 +46,7 @@ You'll find in this folder the following resources:
 === Updating the build pipeline
 
 Updating files on the repository is not enough to update the build pipeline, as changes need to be applied.
+
 The pipeline can be deployed using the following command:
 
 [source]
@@ -48,4 +54,4 @@ The pipeline can be deployed using the following command:
 $ fly -t spring set-pipeline -p spring-framework-5.3.x -c ci/pipeline.yml -l ci/parameters.yml
 ----
 
-NOTE: This assumes that you have credhub integration configured with the appropriate secrets.
+NOTE: This assumes that you have credhub integration configured with the appropriate secrets.

ci/config/changelog-generator.yml

@@ -4,7 +4,7 @@ changelog:
     - title: ":star: New Features"
       labels:
         - "type: enhancement"
-    - title: ":beetle: Bug Fixes"
+    - title: ":lady_beetle: Bug Fixes"
       labels:
         - "type: bug"
         - "type: regression"

ci/config/release-scripts.yml

@@ -1,9 +1,10 @@
 logging:
   level:
     io.spring.concourse: DEBUG
-distribute:
-  optional-deployments:
-    - '.*\\.zip'
 spring:
   main:
-    banner-mode: off
+    banner-mode: off
+sonatype:
+  exclude:
+    - 'build-info\.json'
+    - '.*\.zip'

ci/images/ci-image/Dockerfile

@@ -0,0 +1,11 @@
+FROM ubuntu:focal-20210827
+
+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 JDK16 /opt/openjdk/java16
+
+ENV PATH $JAVA_HOME/bin:$PATH

ci/images/get-jdk-url.sh

@@ -3,16 +3,13 @@ set -e
 
 case "$1" in
 	java8)
-		 echo "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u265-b01/OpenJDK8U-jdk_x64_linux_hotspot_8u265b01.tar.gz"
+		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz"
 	;;
 	java11)
-		 echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.8%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz"
+		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
 	;;
-	java14)
-		 echo "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz"
-	;;
-  java15)
-		 echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15%2B36/OpenJDK15U-jdk_x64_linux_hotspot_15_36.tar.gz"
+  java16)
+		 echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
   ;;
   *)
 		echo $"Unknown java version"

ci/images/setup.sh

@@ -5,24 +5,34 @@ set -ex
 # UTILS
 ###########################################################
 
+export DEBIAN_FRONTEND=noninteractive
 apt-get update
-apt-get install --no-install-recommends -y ca-certificates net-tools libxml2-utils git curl libudev1 libxml2-utils iptables iproute2 jq fontconfig
+apt-get install --no-install-recommends -y tzdata ca-certificates net-tools libxml2-utils git curl libudev1 libxml2-utils iptables iproute2 jq fontconfig
+ln -fs /usr/share/zoneinfo/UTC /etc/localtime
+dpkg-reconfigure --frontend noninteractive tzdata
 rm -rf /var/lib/apt/lists/*
 
-curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.3/concourse-java.sh > /opt/concourse-java.sh
+curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh > /opt/concourse-java.sh
 
-curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.2.1/concourse-release-scripts-0.2.1.jar
+curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.2/concourse-release-scripts-0.3.2.jar
 
 ###########################################################
 # JAVA
 ###########################################################
-JDK_URL=$( ./get-jdk-url.sh $1 )
 
 mkdir -p /opt/openjdk
-cd /opt/openjdk
-curl -L ${JDK_URL} | tar zx --strip-components=1
-test -f /opt/openjdk/bin/java
-test -f /opt/openjdk/bin/javac
+pushd /opt/openjdk > /dev/null
+for jdk in java8 java11 java16
+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
 
 ###########################################################
 # GRADLE ENTERPRISE

ci/images/spring-framework-ci-image/Dockerfile

@@ -1,8 +0,0 @@
-FROM ubuntu:bionic-20200713
-
-ADD setup.sh /setup.sh
-ADD get-jdk-url.sh /get-jdk-url.sh
-RUN ./setup.sh java8
-
-ENV JAVA_HOME /opt/openjdk
-ENV PATH $JAVA_HOME/bin:$PATH

ci/images/spring-framework-jdk11-ci-image/Dockerfile

@@ -1,8 +0,0 @@
-FROM ubuntu:bionic-20200713
-
-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

ci/images/spring-framework-jdk14-ci-image/Dockerfile

@@ -1,8 +0,0 @@
-FROM ubuntu:bionic-20200713
-
-ADD setup.sh /setup.sh
-ADD get-jdk-url.sh /get-jdk-url.sh
-RUN ./setup.sh java14
-
-ENV JAVA_HOME /opt/openjdk
-ENV PATH $JAVA_HOME/bin:$PATH

ci/images/spring-framework-jdk15-ci-image/Dockerfile

@@ -1,8 +0,0 @@
-FROM ubuntu:bionic-20200713
-
-ADD setup.sh /setup.sh
-ADD get-jdk-url.sh /get-jdk-url.sh
-RUN ./setup.sh java15
-
-ENV JAVA_HOME /opt/openjdk
-ENV PATH $JAVA_HOME/bin:$PATH

ci/parameters.yml

@@ -5,10 +5,9 @@ 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: "master"
+branch: "main"
+milestone: "5.3.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
-bintray-subject: "spring"
-bintray-repo: "jars"
-task-timeout: 1h00m
+task-timeout: 1h00m

ci/pipeline.yml

@@ -1,21 +1,29 @@
 anchors:
-  artifactory-task-params: &artifactory-task-params
-    ARTIFACTORY_SERVER: ((artifactory-server))
-    ARTIFACTORY_USERNAME: ((artifactory-username))
-    ARTIFACTORY_PASSWORD: ((artifactory-password))
-  bintray-task-params: &bintray-task-params
-    BINTRAY_SUBJECT: ((bintray-subject))
-    BINTRAY_REPO: ((bintray-repo))
-    BINTRAY_USERNAME: ((bintray-username))
-    BINTRAY_API_KEY: ((bintray-api-key))
-  docker-resource-source: &docker-resource-source
-    username: ((docker-hub-username))
-    password: ((docker-hub-password))
-    tag: 5.3.x
+  git-repo-resource-source: &git-repo-resource-source
+    uri: ((github-repo))
+    username: ((github-username))
+    password: ((github-ci-release-token))
+    branch: ((branch))
   gradle-enterprise-task-params: &gradle-enterprise-task-params
     GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
     GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
     GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
+  sonatype-task-params: &sonatype-task-params
+    SONATYPE_USERNAME: ((sonatype-username))
+    SONATYPE_PASSWORD: ((sonatype-password))
+    SONATYPE_URL: ((sonatype-url))
+    SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id))
+  artifactory-task-params: &artifactory-task-params
+    ARTIFACTORY_SERVER: ((artifactory-server))
+    ARTIFACTORY_USERNAME: ((artifactory-username))
+    ARTIFACTORY_PASSWORD: ((artifactory-password))
+  build-project-task-params: &build-project-task-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!>
@@ -24,9 +32,6 @@ anchors:
     silent: true
     icon_emoji: ":concourse:"
     username: concourse-ci
-  sonatype-task-params: &sonatype-task-params
-    SONATYPE_USER_TOKEN: ((sonatype-user-token))
-    SONATYPE_PASSWORD_TOKEN: ((sonatype-user-token-password))
   changelog-task-params: &changelog-task-params
     name: generated-changelog/tag
     tag: generated-changelog/tag
@@ -40,27 +45,28 @@ resource_types:
   type: registry-image
   source:
     repository: springio/artifactory-resource
-    tag: 0.0.12
+    tag: 0.0.17
 - name: github-status-resource
   type: registry-image
   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:
     repository: cfcommunity/slack-notification-resource
     tag: latest
-
 resources:
 - name: git-repo
   type: git
   icon: github
   source:
-    uri: ((github-repo))
-    username: ((github-username))
-    password: ((github-password))
-    branch: ((branch))
+    <<: *git-repo-resource-source
 - name: every-morning
   type: time
   icon: alarm
@@ -75,30 +81,12 @@ resources:
     uri: ((github-repo))
     branch: ((branch))
     paths: ["ci/images/*"]
-- name: spring-framework-ci-image
+- name: ci-image
   type: docker-image
   icon: docker
   source:
     <<: *docker-resource-source
-    repository: ((docker-hub-organization))/spring-framework-ci-image
-- name: spring-framework-jdk11-ci-image
-  type: docker-image
-  icon: docker
-  source:
-    <<: *docker-resource-source
-    repository: ((docker-hub-organization))/spring-framework-jdk11-ci-image
-- name: spring-framework-jdk14-ci-image
-  type: docker-image
-  icon: docker
-  source:
-    <<: *docker-resource-source
-    repository: ((docker-hub-organization))/spring-framework-jdk14-ci-image
-- name: spring-framework-jdk15-ci-image
-  type: docker-image
-  icon: docker
-  source:
-    <<: *docker-resource-source
-    repository: ((docker-hub-organization))/spring-framework-jdk15-ci-image
+    repository: ((docker-hub-organization))/spring-framework-ci
 - name: artifactory-repo
   type: artifactory-resource
   icon: package-variant
@@ -107,6 +95,14 @@ 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
@@ -123,22 +119,14 @@ resources:
     access_token: ((github-ci-status-token))
     branch: ((branch))
     context: jdk11-build
-- name: repo-status-jdk14-build
+- name: repo-status-jdk16-build
   type: github-status-resource
   icon: eye-check-outline
   source:
     repository: ((github-repo-name))
     access_token: ((github-ci-status-token))
     branch: ((branch))
-    context: jdk14-build
-- name: repo-status-jdk15-build
-  type: github-status-resource
-  icon: eye-check-outline
-  source:
-    repository: ((github-repo-name))
-    access_token: ((github-ci-status-token))
-    branch: ((branch))
-    context: jdk15-build
+    context: jdk16-build
 - name: slack-alert
   type: slack-notification
   icon: slack
@@ -161,47 +149,33 @@ resources:
     repository: spring-framework
     access_token: ((github-ci-release-token))
     pre_release: false
-
 jobs:
-- name: build-spring-framework-ci-images
+- name: build-ci-images
   plan:
   - get: ci-images-git-repo
     trigger: true
   - in_parallel:
-    - put: spring-framework-ci-image
+    - put: ci-image
       params:
         build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/spring-framework-ci-image/Dockerfile
-    - put: spring-framework-jdk11-ci-image
-      params:
-        build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/spring-framework-jdk11-ci-image/Dockerfile
-    - put: spring-framework-jdk14-ci-image
-      params:
-        build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/spring-framework-jdk14-ci-image/Dockerfile
-    - put: spring-framework-jdk15-ci-image
-      params:
-        build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/spring-framework-jdk15-ci-image/Dockerfile
+        dockerfile: ci-images-git-repo/ci/images/ci-image/Dockerfile
 - name: build
   serial: true
   public: true
   plan:
-  - get: spring-framework-ci-image
+  - get: ci-image
   - get: git-repo
     trigger: true
   - put: repo-status-build
     params: { state: "pending", commit: "git-repo" }
   - do:
     - task: build-project
+      image: ci-image
+      file: git-repo/ci/tasks/build-project.yml
       privileged: true
       timeout: ((task-timeout))
-      image: spring-framework-ci-image
-      file: git-repo/ci/tasks/build-project.yml
       params:
-        BRANCH: ((branch))
-        <<: *gradle-enterprise-task-params
+        <<: *build-project-task-params
     on_failure:
       do:
       - put: repo-status-build
@@ -213,6 +187,8 @@ jobs:
     params: { state: "success", commit: "git-repo" }
   - put: artifactory-repo
     params: &artifactory-params
+      signing_key: ((signing-key))
+      signing_passphrase: ((signing-passphrase))
       repo: libs-snapshot-local
       folder: distribution-repository
       build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}"
@@ -244,7 +220,7 @@ jobs:
   serial: true
   public: true
   plan:
-  - get: spring-framework-jdk11-ci-image
+  - get: ci-image
   - get: git-repo
   - get: every-morning
     trigger: true
@@ -252,13 +228,13 @@ jobs:
     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))
-      image: spring-framework-jdk11-ci-image
-      file: git-repo/ci/tasks/check-project.yml
       params:
-        BRANCH: ((branch))
-        <<: *gradle-enterprise-task-params
+        TEST_TOOLCHAIN: 11
+        <<: *build-project-task-params
     on_failure:
       do:
       - put: repo-status-jdk11-build
@@ -268,70 +244,73 @@ jobs:
           <<: *slack-fail-params
   - put: repo-status-jdk11-build
     params: { state: "success", commit: "git-repo" }
-- name: jdk14-build
+- name: jdk16-build
   serial: true
   public: true
   plan:
-    - get: spring-framework-jdk14-ci-image
+    - get: ci-image
     - get: git-repo
     - get: every-morning
       trigger: true
-    - put: repo-status-jdk14-build
+    - put: repo-status-jdk16-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))
-        image: spring-framework-jdk14-ci-image
-        file: git-repo/ci/tasks/check-project.yml
         params:
-          BRANCH: ((branch))
-          <<: *gradle-enterprise-task-params
+          TEST_TOOLCHAIN: 15
+          <<: *build-project-task-params
       on_failure:
         do:
-          - put: repo-status-jdk14-build
+          - put: repo-status-jdk16-build
             params: { state: "failure", commit: "git-repo" }
           - put: slack-alert
             params:
               <<: *slack-fail-params
-    - put: repo-status-jdk14-build
+    - put: repo-status-jdk16-build
       params: { state: "success", commit: "git-repo" }
-- name: jdk15-build
+- name: build-pull-requests
   serial: true
   public: true
   plan:
-    - get: spring-framework-jdk15-ci-image
+    - get: ci-image
     - get: git-repo
-    - get: every-morning
+      resource: git-pull-request
       trigger: true
-    - put: repo-status-jdk15-build
-      params: { state: "pending", commit: "git-repo" }
+      version: every
     - do:
-        - task: check-project
-          privileged: true
-          timeout: ((task-timeout))
-          image: spring-framework-jdk15-ci-image
-          file: git-repo/ci/tasks/check-project.yml
-          params:
-            BRANCH: ((branch))
-            <<: *gradle-enterprise-task-params
+      - 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:
-        do:
-          - put: repo-status-jdk15-build
-            params: { state: "failure", commit: "git-repo" }
-          - put: slack-alert
-            params:
-              <<: *slack-fail-params
-    - put: repo-status-jdk15-build
-      params: { state: "success", commit: "git-repo" }
+        put: git-pull-request
+        params:
+          path: git-repo
+          status: failure
 - name: stage-milestone
   serial: true
   plan:
-    - get: spring-framework-ci-image
+    - get: ci-image
     - get: git-repo
       trigger: false
     - task: stage
-      image: spring-framework-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/stage-version.yml
       params:
         RELEASE_TYPE: M
@@ -346,7 +325,7 @@ jobs:
 - name: promote-milestone
   serial: true
   plan:
-    - get: spring-framework-ci-image
+    - get: ci-image
     - get: git-repo
       trigger: false
     - get: artifactory-repo
@@ -356,7 +335,7 @@ jobs:
         download_artifacts: false
         save_build_info: true
     - task: promote
-      image: spring-framework-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/promote-version.yml
       params:
         RELEASE_TYPE: M
@@ -372,11 +351,11 @@ jobs:
 - name: stage-rc
   serial: true
   plan:
-    - get: spring-framework-ci-image
+    - get: ci-image
     - get: git-repo
       trigger: false
     - task: stage
-      image: spring-framework-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/stage-version.yml
       params:
         RELEASE_TYPE: RC
@@ -391,7 +370,7 @@ jobs:
 - name: promote-rc
   serial: true
   plan:
-    - get: spring-framework-ci-image
+    - get: ci-image
     - get: git-repo
       trigger: false
     - get: artifactory-repo
@@ -401,7 +380,7 @@ jobs:
         download_artifacts: false
         save_build_info: true
     - task: promote
-      image: spring-framework-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/promote-version.yml
       params:
         RELEASE_TYPE: RC
@@ -417,11 +396,11 @@ jobs:
 - name: stage-release
   serial: true
   plan:
-    - get: spring-framework-ci-image
+    - get: ci-image
     - get: git-repo
       trigger: false
     - task: stage
-      image: spring-framework-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/stage-version.yml
       params:
         RELEASE_TYPE: RELEASE
@@ -436,26 +415,26 @@ jobs:
 - name: promote-release
   serial: true
   plan:
-    - get: spring-framework-ci-image
+    - get: ci-image
     - get: git-repo
       trigger: false
     - get: artifactory-repo
       trigger: false
       passed: [stage-release]
       params:
-        download_artifacts: false
+        download_artifacts: true
         save_build_info: true
     - task: promote
-      image: spring-framework-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/promote-version.yml
       params:
         RELEASE_TYPE: RELEASE
         <<: *artifactory-task-params
-        <<: *bintray-task-params
-- name: sync-to-maven-central
+        <<: *sonatype-task-params
+- name: create-github-release
   serial: true
   plan:
-    - get: spring-framework-ci-image
+    - get: ci-image
     - get: git-repo
     - get: artifactory-repo
       trigger: true
@@ -463,12 +442,6 @@ jobs:
       params:
         download_artifacts: false
         save_build_info: true
-    - task: sync-to-maven-central
-      image: spring-framework-ci-image
-      file: git-repo/ci/tasks/sync-to-maven-central.yml
-      params:
-        <<: *bintray-task-params
-        <<: *sonatype-task-params
     - task: generate-changelog
       file: git-repo/ci/tasks/generate-changelog.yml
       params:
@@ -480,8 +453,10 @@ jobs:
 
 groups:
 - name: "builds"
-  jobs: ["build", "jdk11-build", "jdk14-build", "jdk15-build"]
+  jobs: ["build", "jdk11-build", "jdk16-build"]
 - name: "releases"
-  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone","promote-rc", "promote-release", "sync-to-maven-central"]
+  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"
-  jobs: ["build-spring-framework-ci-images"]
+  jobs: ["build-ci-images"]
+- name: "pull-requests"
+  jobs: [ "build-pull-requests" ]

ci/scripts/build-pr.sh

@@ -0,0 +1,8 @@
+#!/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

ci/scripts/check-project.sh

@@ -4,5 +4,6 @@ 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
+./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
 popd > /dev/null

ci/scripts/generate-changelog.sh

@@ -2,7 +2,7 @@
 set -e
 
 CONFIG_DIR=git-repo/ci/config
-version=$( cat version/version )
+version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
 
 java -jar /github-changelog-generator.jar \
   --spring.config.location=${CONFIG_DIR}/changelog-generator.yml \

ci/scripts/promote-version.sh

@@ -6,11 +6,13 @@ 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 promote $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; }
+java -jar /opt/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 \
   --spring.config.location=${CONFIG_DIR}/release-scripts.yml \
-  distribute $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; }
+  promote $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; }
 
 echo "Promotion complete"
 echo $version > version/version

ci/scripts/stage-version.sh

@@ -29,8 +29,8 @@ fi
 echo "Staging $stageVersion (next version will be $nextVersion)"
 sed -i "s/version=$snapshotVersion/version=$stageVersion/" gradle.properties
 
-git config user.name "Spring Buildmaster" > /dev/null
-git config user.email "buildmaster@springframework.org" > /dev/null
+git config user.name "Spring Builds" > /dev/null
+git config user.email "spring-builds@users.noreply.github.com" > /dev/null
 git add gradle.properties > /dev/null
 git commit -m"Release v$stageVersion" > /dev/null
 git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null

ci/tasks/build-pr.yml

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

ci/tasks/check-project.yml

@@ -10,6 +10,8 @@ caches:
 params:
   BRANCH:
   CI: true
+  MAIN_TOOLCHAIN:
+  TEST_TOOLCHAIN:
   GRADLE_ENTERPRISE_ACCESS_KEY:
   GRADLE_ENTERPRISE_CACHE_USERNAME:
   GRADLE_ENTERPRISE_CACHE_PASSWORD:

ci/tasks/generate-changelog.yml

@@ -1,13 +1,13 @@
 ---
 platform: linux
 image_resource:
-  type: docker-image
+  type: registry-image
   source:
     repository: springio/github-changelog-generator
-    tag: '0.0.4'
+    tag: '0.0.6'
 inputs:
 - name: git-repo
-- name: version
+- name: artifactory-repo
 outputs:
 - name: generated-changelog
 params:

ci/tasks/promote-version.yml

@@ -10,9 +10,9 @@ params:
   ARTIFACTORY_SERVER:
   ARTIFACTORY_USERNAME:
   ARTIFACTORY_PASSWORD:
-  BINTRAY_SUBJECT:
-  BINTRAY_REPO:
-  BINTRAY_USERNAME:
-  BINTRAY_API_KEY:
+  SONATYPE_USER:
+  SONATYPE_PASSWORD:
+  SONATYPE_URL:
+  SONATYPE_STAGING_PROFILE_ID:
 run:
   path: git-repo/ci/scripts/promote-version.sh

ci/tasks/sync-to-maven-central.yml

@@ -1,16 +0,0 @@
----
-platform: linux
-inputs:
-- name: git-repo
-- name: artifactory-repo
-outputs:
-- name: version
-params:
-  BINTRAY_REPO:
-  BINTRAY_SUBJECT:
-  BINTRAY_USERNAME:
-  BINTRAY_API_KEY:
-  SONATYPE_USER_TOKEN:
-  SONATYPE_PASSWORD_TOKEN:
-run:
-  path: git-repo/ci/scripts/sync-to-maven-central.sh

gradle.properties

@@ -1,4 +1,4 @@
-version=5.3.2
+version=5.3.10
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/custom-java-home.gradle

@@ -1,80 +0,0 @@
-// -----------------------------------------------------------------------------
-//
-// 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)
-		}
-	}
-
-}

gradle/docs-dokka.gradle

@@ -0,0 +1,30 @@
+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://hamcrest.org/JavaHamcrest/javadoc/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/"))
+			}
+		}
+    }
+}

gradle/docs.gradle

@@ -61,54 +61,13 @@ task api(type: Javadoc) {
 /**
  * Produce KDoc for all Spring Framework modules in "build/docs/kdoc"
  */
-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/")
-		}
-		externalDocumentationLink {
-			url = new URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
-		}
-		externalDocumentationLink {
-			url = new URL("https://r2dbc.io/spec/0.8.3.RELEASE/api/")
+pluginManager.withPlugin("kotlin") {
+	tasks.dokkaHtmlMultiModule.configure {
+		dependsOn {
+			tasks.getByName("api")
 		}
+		moduleName.set("spring-framework")
+		outputDirectory.set(project.file("$buildDir/docs/kdoc"))
 	}
 }
 
@@ -127,6 +86,8 @@ 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'
 	fatalWarnings ".*"
 	options doctype: 'book', eruby: 'erubis'
@@ -134,7 +95,7 @@ asciidoctorj {
 			icons: 'font',
 			idprefix: '',
 			idseparator: '-',
-			docinfo: 'shared',
+			docinfo: 'shared,private-header', // https://docs.asciidoctor.org/asciidoctor/latest/docinfo/
 			revnumber: project.version,
 			sectanchors: '',
 			sectnums: '',
@@ -143,7 +104,11 @@ asciidoctorj {
 			'highlightjs-theme': 'googlecode',
 			stylesdir: 'css/',
 			stylesheet: 'stylesheet.css',
-			'spring-version': project.version
+			'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"
 	])
 }
 
@@ -184,7 +149,7 @@ asciidoctorPdf {
 /**
  * Zip all docs (API and reference) into a single archive
  */
-task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokka']) {
+task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokkaHtmlMultiModule']) {
 	group = "Distribution"
 	description = "Builds -${archiveClassifier} archive containing api and reference " +
 			"for deployment at https://docs.spring.io/spring-framework/docs."
@@ -203,7 +168,7 @@ task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dok
 	from ("$asciidoctorPdf.outputDir") {
 		into "reference/pdf"
 	}
-	from (dokka) {
+	from (dokkaHtmlMultiModule.outputDirectory) {
 		into "kdoc-api"
 	}
 }
@@ -260,11 +225,11 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
 		expand(copyright: new Date().format("yyyy"), version: project.version)
 	}
 
-	from(zipTree(docsZip.archivePath)) {
+	from(zipTree(docsZip.archiveFile)) {
 		into "${baseDir}/docs"
 	}
 
-	from(zipTree(schemaZip.archivePath)) {
+	from(zipTree(schemaZip.archiveFile)) {
 		into "${baseDir}/schema"
 	}
 

gradle/ide.gradle

@@ -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,48 +18,45 @@ 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 dependency = new ProjectDependency(path)
-				dependency.exported = true
-				classpath.entries.add(dependency)
+			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))
+				}
 			}
 			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 { classpath ->
-	classpath.entries.findAll{ it instanceof SourceFolder }.each {
-		it.output = "bin/" + it.path.split("/")[1]
+eclipse.classpath.file.whenMerged {
+	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 { classpath ->
-	classpath.entries.findAll { it instanceof ProjectDependency }.each {
-		// delete from original position
-		classpath.entries.remove(it)
-		// append to end of classpath
-		classpath.entries.add(it)
-	}
-}
-
-// Ensure that test fixture dependencies are handled properly in Gradle 6.7.
-// Bug fixed in Gradle 6.8: https://github.com/gradle/gradle/issues/14932 
 eclipse.classpath.file.whenMerged {
 	entries.findAll { it instanceof ProjectDependency }.each {
-		it.entryAttributes.remove('without_test_code')
+		// delete from original position
+		entries.remove(it)
+		// append to end of classpath
+		entries.add(it)
 	}
 }
 
@@ -73,64 +70,41 @@ eclipse.classpath.file.whenMerged {
 }
 
 // Allow projects to be used as WTP modules
-eclipse.project.natures "org.eclipse.wst.common.project.facet.core.nature"
+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.ui.prefs",
-		"src/eclipse/org.eclipse.wst.common.project.facet.core.xml")
+		'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 eclipseWstComponent(type: Copy) {
-	from rootProject.files(
-		"src/eclipse/org.eclipse.wst.common.component")
+task eclipseJdtSettings(type: Copy) {
+	from rootProject.file('src/eclipse/org.eclipse.jdt.core.prefs')
+	into project.file('.settings/')
+	outputs.upToDateWhen { false }
+}
+
+task eclipseBuildship {
+	dependsOn eclipseSettings, eclipseJdtSettings
+}
+
+task eclipseWstComponentSettings(type: Copy) {
+	from rootProject.files('src/eclipse/org.eclipse.wst.common.component')
 	into project.file('.settings/')
 	expand(deployname: project.name)
 	outputs.upToDateWhen { false }
 }
 
-task eclipseJdtPrepare(type: Copy) {
-	from rootProject.file("src/eclipse/org.eclipse.jdt.core.prefs")
-	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')
+	delete project.file('.settings/org.eclipse.wst.common.component')
+	delete project.file('.settings/org.eclipse.wst.common.project.facet.core.xml')
 }
 
-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")
-}
+tasks['eclipse'].dependsOn(eclipseSettings, eclipseJdtSettings, eclipseWstComponentSettings)
+tasks['eclipseJdt'].dependsOn(eclipseJdtSettings)
+tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)

gradle/spring-module.gradle

@@ -1,17 +1,42 @@
+apply plugin: 'java-library'
 apply plugin: 'org.springframework.build.compile'
 apply plugin: 'org.springframework.build.optional-dependencies'
-apply plugin: 'me.champeau.gradle.jmh'
+// 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.23'
-	jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.23'
-	jmh 'net.sf.jopt-simple:jopt-simple:4.6'
+	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

gradle/toolchains.gradle

@@ -0,0 +1,182 @@
+/**
+ * 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
+	}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   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/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-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
+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
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${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
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 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
@@ -98,7 +132,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
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-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
-
-# 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" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # 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=`expr $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" ;;
+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
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# 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.
 
-# 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"
+# 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" )
+
+    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
+    done
+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.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# 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' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

integration-tests/integration-tests.gradle

@@ -1,26 +1,26 @@
 description = "Spring Integration Tests"
 
 dependencies {
-	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")
+	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")
 }
 
 normalization {

settings.gradle

@@ -1,13 +1,13 @@
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
-		maven { url 'https://repo.spring.io/plugins-release' }
+		maven { url "https://repo.spring.io/plugins-release" }
 	}
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.2"
-	id "io.spring.gradle-enterprise-conventions" version "0.0.2"
+	id "com.gradle.enterprise" version "3.6.1"
+	id "io.spring.ge.conventions" version "0.0.7"
 }
 
 include "spring-aop"
@@ -17,8 +17,6 @@ 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"
@@ -45,19 +43,13 @@ rootProject.children.each {project ->
 settings.gradle.projectsLoaded {
 	gradleEnterprise {
 		buildScan {
-			if (settings.gradle.rootProject.hasProperty('customJavaHome')) {
-				value("Custom JAVA_HOME", settings.gradle.rootProject.getProperty('customJavaHome'))
-			}
-			if (settings.gradle.rootProject.hasProperty('customJavaSourceVersion')) {
-				value("Custom Java Source Version", settings.gradle.rootProject.getProperty('customJavaSourceVersion'))
-			}
 			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"
-				} 
+				}
 			}
 		}
 	}

spring-aop/spring-aop.gradle

@@ -1,12 +1,13 @@
 description = "Spring AOP"
 
 dependencies {
-	compile(project(":spring-beans"))
-	compile(project(":spring-core"))
+	api(project(":spring-beans"))
+	api(project(":spring-core"))
 	optional("org.aspectj:aspectjweaver")
 	optional("org.apache.commons:commons-pool2")
 	optional("com.jamonapi:jamon")
-	testCompile(testFixtures(project(":spring-beans")))
-	testCompile(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-beans")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testFixturesImplementation(testFixtures(project(":spring-beans")))
 	testFixturesImplementation(testFixtures(project(":spring-core")))
 }

spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 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.
@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
  * terminology).
  *
  * <p>A runtime joinpoint is an <i>event</i> that occurs on a static
- * joinpoint (i.e. a location in a the program). For instance, an
+ * joinpoint (i.e. a location in a program). For instance, an
  * invocation is the runtime joinpoint on a method (static joinpoint).
  * The static part of a given joinpoint can be generically retrieved
  * using the {@link #getStaticPart()} method.

spring-aop/src/main/java/org/springframework/aop/DynamicIntroductionAdvice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -26,7 +26,7 @@ import org.aopalliance.aop.Advice;
  * <p>Introductions are often <b>mixins</b>, enabling the building of composite
  * objects that can achieve many of the goals of multiple inheritance in Java.
  *
- * <p>Compared to {qlink IntroductionInfo}, this interface allows an advice to
+ * <p>Compared to {@link IntroductionInfo}, this interface allows an advice to
  * implement a range of interfaces that is not necessarily known in advance.
  * Thus an {@link IntroductionAdvisor} can be used to specify which interfaces
  * will be exposed in an advised object.

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscoverer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -625,7 +625,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 +645,7 @@ public class AspectJAdviceParameterNameDiscoverer implements ParameterNameDiscov
 					toAppend = toAppend.substring(1);
 				}
 				sb.append(toAppend);
-				sb.append(" ");
+				sb.append(' ');
 				currentIndex++;
 				numTokensConsumed++;
 			}

spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -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(", ");

spring-aop/src/main/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -255,19 +255,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 +278,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(',');
 					}
 				}
 			}

spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -103,10 +103,11 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	@Override
 	public void validate(Class<?> aspectClass) throws AopConfigException {
 		// If the parent has the annotation and isn't abstract it's an error
-		if (aspectClass.getSuperclass().getAnnotation(Aspect.class) != null &&
-				!Modifier.isAbstract(aspectClass.getSuperclass().getModifiers())) {
+		Class<?> superclass = aspectClass.getSuperclass();
+		if (superclass.getAnnotation(Aspect.class) != null &&
+				!Modifier.isAbstract(superclass.getModifiers())) {
 			throw new AopConfigException("[" + aspectClass.getName() + "] cannot extend concrete aspect [" +
-					aspectClass.getSuperclass().getName() + "]");
+					superclass.getName() + "]");
 		}
 
 		AjType<?> ajType = AjTypeSystem.getAjType(aspectClass);

spring-aop/src/main/java/org/springframework/aop/framework/AbstractAdvisingBeanPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -22,6 +22,7 @@ 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;
 
 /**
@@ -89,7 +90,13 @@ public abstract class AbstractAdvisingBeanPostProcessor extends ProxyProcessorSu
 			}
 			proxyFactory.addAdvisor(this.advisor);
 			customizeProxyFactory(proxyFactory);
-			return proxyFactory.getProxy(getProxyClassLoader());
+
+			// 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);
 		}
 
 		// No proxy needed.

spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java

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

spring-aop/src/main/java/org/springframework/aop/framework/AopProxyUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -19,7 +19,9 @@ 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;
@@ -29,7 +31,9 @@ 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,6 +48,11 @@ import org.springframework.util.ObjectUtils;
  */
 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
@@ -130,34 +139,23 @@ public abstract class AopProxyUtils {
 				specifiedInterfaces = advised.getProxiedInterfaces();
 			}
 		}
-		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++;
+		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);
+			}
 		}
-		if (addAdvised) {
-			nonUserIfcCount++;
+		if (!advised.isInterfaceProxied(SpringProxy.class)) {
+			proxiedInterfaces.add(SpringProxy.class);
 		}
-		if (addDecoratingProxy) {
-			nonUserIfcCount++;
+		if (!advised.isOpaque() && !advised.isInterfaceProxied(Advised.class)) {
+			proxiedInterfaces.add(Advised.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++;
+		if (decoratingProxy && !advised.isInterfaceProxied(DecoratingProxy.class)) {
+			proxiedInterfaces.add(DecoratingProxy.class);
 		}
-		if (addAdvised) {
-			proxiedInterfaces[index] = Advised.class;
-			index++;
-		}
-		if (addDecoratingProxy) {
-			proxiedInterfaces[index] = DecoratingProxy.class;
-		}
-		return proxiedInterfaces;
+		return ClassUtils.toClassArray(proxiedInterfaces);
 	}
 
 	/**

spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java

@@ -48,6 +48,7 @@ import org.springframework.cglib.proxy.Factory;
 import org.springframework.cglib.proxy.MethodInterceptor;
 import org.springframework.cglib.proxy.MethodProxy;
 import org.springframework.cglib.proxy.NoOp;
+import org.springframework.core.KotlinDetector;
 import org.springframework.core.SmartClassLoader;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
@@ -752,10 +753,17 @@ class CglibAopProxy implements AopProxy, Serializable {
 				throw ex;
 			}
 			catch (Exception ex) {
-				if (ReflectionUtils.declaresException(getMethod(), ex.getClass())) {
+				if (ReflectionUtils.declaresException(getMethod(), ex.getClass()) ||
+						KotlinDetector.isKotlinType(getMethod().getDeclaringClass())) {
+					// Propagate original exception if declared on the target method
+					// (with callers expecting it). Always propagate it for Kotlin code
+					// since checked exceptions do not have to be explicitly declared there.
 					throw ex;
 				}
 				else {
+					// Checked exception thrown in the interceptor but not declared on the
+					// target method signature -> apply an UndeclaredThrowableException,
+					// aligned with standard JDK dynamic proxy behavior.
 					throw new UndeclaredThrowableException(ex);
 				}
 			}

spring-aop/src/main/java/org/springframework/aop/framework/DefaultAopProxyFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 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,6 +20,7 @@ import java.io.Serializable;
 import java.lang.reflect.Proxy;
 
 import org.springframework.aop.SpringProxy;
+import org.springframework.core.NativeDetector;
 
 /**
  * Default {@link AopProxyFactory} implementation, creating either a CGLIB proxy
@@ -47,17 +48,10 @@ import org.springframework.aop.SpringProxy;
 @SuppressWarnings("serial")
 public class DefaultAopProxyFactory implements AopProxyFactory, Serializable {
 
-	/**
-	 * Whether this environment lives within a native image.
-	 * Exposed as a private static field rather than in a {@code NativeImageDetector.inNativeImage()} static method due to https://github.com/oracle/graal/issues/2594.
-	 * @see <a href="https://github.com/oracle/graal/blob/master/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java">ImageInfo.java</a>
-	 */
-	private static final boolean IN_NATIVE_IMAGE = (System.getProperty("org.graalvm.nativeimage.imagecode") != null);
-
 
 	@Override
 	public AopProxy createAopProxy(AdvisedSupport config) throws AopConfigException {
-		if (!IN_NATIVE_IMAGE &&
+		if (!NativeDetector.inNativeImage() &&
 				(config.isOptimize() || config.isProxyTargetClass() || hasNoUserSuppliedProxyInterfaces(config))) {
 			Class<?> targetClass = config.getTargetClass();
 			if (targetClass == null) {

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -17,6 +17,7 @@
 package org.springframework.aop.framework.autoproxy;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -46,6 +47,7 @@ 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.StringUtils;
@@ -439,7 +441,17 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 		ProxyFactory proxyFactory = new ProxyFactory();
 		proxyFactory.copyFrom(this);
 
-		if (!proxyFactory.isProxyTargetClass()) {
+		if (proxyFactory.isProxyTargetClass()) {
+			// 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);
+				}
+			}
+		}
+		else {
+			// No proxyTargetClass flag enforced, let's apply our default checks...
 			if (shouldProxyTargetClass(beanClass, beanName)) {
 				proxyFactory.setProxyTargetClass(true);
 			}
@@ -458,7 +470,12 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 			proxyFactory.setPreFiltered(true);
 		}
 
-		return proxyFactory.getProxy(getProxyClassLoader());
+		// 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);
 	}
 
 	/**
@@ -503,7 +520,10 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 
 		List<Object> allInterceptors = new ArrayList<>();
 		if (specificInterceptors != null) {
-			allInterceptors.addAll(Arrays.asList(specificInterceptors));
+			if (specificInterceptors.length > 0) {
+				// specificInterceptors may equal PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS
+				allInterceptors.addAll(Arrays.asList(specificInterceptors));
+			}
 			if (commonInterceptors.length > 0) {
 				if (this.applyCommonInterceptorsFirst) {
 					allInterceptors.addAll(0, Arrays.asList(commonInterceptors));

spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/target/AbstractBeanFactoryBasedTargetSourceCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -125,12 +125,8 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 	 */
 	protected DefaultListableBeanFactory getInternalBeanFactoryForBean(String beanName) {
 		synchronized (this.internalBeanFactories) {
-			DefaultListableBeanFactory internalBeanFactory = this.internalBeanFactories.get(beanName);
-			if (internalBeanFactory == null) {
-				internalBeanFactory = buildInternalBeanFactory(this.beanFactory);
-				this.internalBeanFactories.put(beanName, internalBeanFactory);
-			}
-			return internalBeanFactory;
+			return this.internalBeanFactories.computeIfAbsent(beanName,
+					name -> buildInternalBeanFactory(this.beanFactory));
 		}
 	}
 

spring-aop/src/main/java/org/springframework/aop/support/AbstractBeanFactoryPointcutAdvisor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 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.
@@ -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);

spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -71,7 +71,8 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil
 		if (introductionInfo != null) {
 			Class<?>[] introducedInterfaces = introductionInfo.getInterfaces();
 			if (introducedInterfaces.length == 0) {
-				throw new IllegalArgumentException("IntroductionAdviceSupport implements no interfaces");
+				throw new IllegalArgumentException(
+						"IntroductionInfo defines no interfaces to introduce: " + introductionInfo);
 			}
 			for (Class<?> ifc : introducedInterfaces) {
 				addInterface(ifc);

spring-aop/src/main/java/org/springframework/aop/target/AbstractBeanFactoryBasedTargetSource.java

@@ -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();
 	}

spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -116,7 +116,7 @@ public abstract class AbstractPoolingTargetSource extends AbstractPrototypeBased
 
 
 	/**
-	 * Return an IntroductionAdvisor that providing a mixin
+	 * Return an IntroductionAdvisor that provides a mixin
 	 * exposing statistics about the pool maintained by this object.
 	 */
 	public DefaultIntroductionAdvisor getPoolingConfigMixin() {

spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJAdviceParameterNameDiscovererTests.java

@@ -276,14 +276,14 @@ public class AspectJAdviceParameterNameDiscovererTests {
 
 	private static String format(String[] names) {
 		StringBuilder sb = new StringBuilder();
-		sb.append("(");
+		sb.append('(');
 		for (int i = 0; i < names.length; i++) {
 			sb.append(names[i]);
 			if ((i + 1) < names.length) {
-				sb.append(",");
+				sb.append(',');
 			}
 		}
-		sb.append(")");
+		sb.append(')');
 		return sb.toString();
 	}
 

spring-aop/src/test/java/org/springframework/aop/framework/ProxyFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -183,7 +183,7 @@ public class ProxyFactoryTests {
 	}
 
 	@Test
-	public void testGetsAllInterfaces() throws Exception {
+	public void testGetsAllInterfaces() {
 		// Extend to get new interface
 		class TestBeanSubclass extends TestBean implements Comparable<Object> {
 			@Override
@@ -240,6 +240,16 @@ public class ProxyFactoryTests {
 		assertThat(factory.countAdvicesOfType(NopInterceptor.class) == 2).isTrue();
 	}
 
+	@Test
+	public void testSealedInterfaceExclusion() {
+		// String implements ConstantDesc on JDK 12+, sealed as of JDK 17
+		ProxyFactory factory = new ProxyFactory(new String());
+		NopInterceptor di = new NopInterceptor();
+		factory.addAdvice(0, di);
+		Object proxy = factory.getProxy();
+		assertThat(proxy).isInstanceOf(CharSequence.class);
+	}
+
 	/**
 	 * Should see effect immediately on behavior.
 	 */

spring-aspects/spring-aspects.gradle

@@ -11,7 +11,7 @@ sourceSets.test.java.srcDirs = files()
 aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver']
 
 dependencies {
-	compile("org.aspectj:aspectjweaver")
+	api("org.aspectj:aspectjweaver")
 	compileOnly("org.aspectj:aspectjrt")
 	optional(project(":spring-aop"))  // for @Async support
 	optional(project(":spring-beans"))  // for @Configurable support
@@ -21,13 +21,13 @@ dependencies {
 	optional(project(":spring-tx"))  // for JPA, @Transactional support
 	optional("javax.cache:cache-api")  // for JCache aspect
 	optional("javax.transaction:javax.transaction-api")  // for @javax.transaction.Transactional support
-	testCompile(project(":spring-core"))  // for CodeStyleAspect
-	testCompile(project(":spring-test"))
-	testCompile(testFixtures(project(":spring-context")))
-	testCompile(testFixtures(project(":spring-context-support")))
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile(testFixtures(project(":spring-tx")))
-	testCompile("javax.mail:javax.mail-api")
+	testImplementation(project(":spring-core"))  // for CodeStyleAspect
+	testImplementation(project(":spring-test"))
+	testImplementation(testFixtures(project(":spring-context")))
+	testImplementation(testFixtures(project(":spring-context-support")))
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation(testFixtures(project(":spring-tx")))
+	testImplementation("javax.mail:javax.mail-api")
 	testCompileOnly("org.aspectj:aspectjrt")
 }
 

spring-beans/spring-beans.gradle

@@ -4,14 +4,14 @@ apply plugin: "groovy"
 apply plugin: "kotlin"
 
 dependencies {
-	compile(project(":spring-core"))
+	api(project(":spring-core"))
 	optional("javax.inject:javax.inject")
 	optional("org.yaml:snakeyaml")
 	optional("org.codehaus.groovy:groovy-xml")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
-	testCompile(testFixtures(project(":spring-core")))
-	testCompile("javax.annotation:javax.annotation-api")
+	testImplementation(testFixtures(project(":spring-core")))
+	testImplementation("javax.annotation:javax.annotation-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.assertj:assertj-core")
 }
@@ -23,8 +23,6 @@ sourceSets {
 }
 
 compileGroovy {
-	sourceCompatibility = 1.8
-	targetCompatibility = 1.8
 	options.compilerArgs += "-Werror"
 }
 

spring-beans/src/jmh/resources/org/springframework/beans/factory/ConcurrentBeanFactoryBenchmark-context.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "https://www.springframework.org/dtd/spring-beans-2.0.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
-<beans>
-
-  <bean id="bean1" class="org.springframework.beans.factory.ConcurrentBeanFactoryTests$ConcurrentBean"
+  <bean id="bean1" class="org.springframework.beans.factory.ConcurrentBeanFactoryBenchmark$ConcurrentBean"
 			scope="prototype">
     <property name="date" value="2004/08/08"/>
   </bean>
 
-  <bean id="bean2" class="org.springframework.beans.factory.ConcurrentBeanFactoryTests$ConcurrentBean"
+  <bean id="bean2" class="org.springframework.beans.factory.ConcurrentBeanFactoryBenchmark$ConcurrentBean"
 			scope="prototype">
     <property name="date" value="2000/02/02"/>
   </bean>

spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -305,8 +305,10 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
 					Class<?> componentType = propValue.getClass().getComponentType();
 					Object newArray = Array.newInstance(componentType, arrayIndex + 1);
 					System.arraycopy(propValue, 0, newArray, 0, length);
-					setPropertyValue(tokens.actualName, newArray);
-					propValue = getPropertyValue(tokens.actualName);
+					int lastKeyIndex = tokens.canonicalName.lastIndexOf('[');
+					String propName = tokens.canonicalName.substring(0, lastKeyIndex);
+					setPropertyValue(propName, newArray);
+					propValue = getPropertyValue(propName);
 				}
 				Array.set(propValue, arrayIndex, convertedValue);
 			}

spring-beans/src/main/java/org/springframework/beans/BeanUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -41,8 +41,6 @@ import kotlin.reflect.KParameter;
 import kotlin.reflect.full.KClasses;
 import kotlin.reflect.jvm.KCallablesJvm;
 import kotlin.reflect.jvm.ReflectJvmMapping;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.KotlinDetector;
@@ -75,8 +73,6 @@ import org.springframework.util.StringUtils;
  */
 public abstract class BeanUtils {
 
-	private static final Log logger = LogFactory.getLog(BeanUtils.class);
-
 	private static final ParameterNameDiscoverer parameterNameDiscoverer =
 			new DefaultParameterNameDiscoverer();
 
@@ -91,7 +87,10 @@ public abstract class BeanUtils {
 		values.put(byte.class, (byte) 0);
 		values.put(short.class, (short) 0);
 		values.put(int.class, 0);
-		values.put(long.class, (long) 0);
+		values.put(long.class, 0L);
+		values.put(float.class, 0F);
+		values.put(double.class, 0D);
+		values.put(char.class, '\0');
 		DEFAULT_TYPE_VALUES = Collections.unmodifiableMap(values);
 	}
 
@@ -268,10 +267,7 @@ public abstract class BeanUtils {
 	public static <T> Constructor<T> findPrimaryConstructor(Class<T> clazz) {
 		Assert.notNull(clazz, "Class must not be null");
 		if (KotlinDetector.isKotlinReflectPresent() && KotlinDetector.isKotlinType(clazz)) {
-			Constructor<T> kotlinPrimaryConstructor = KotlinDelegate.findPrimaryConstructor(clazz);
-			if (kotlinPrimaryConstructor != null) {
-				return kotlinPrimaryConstructor;
-			}
+			return KotlinDelegate.findPrimaryConstructor(clazz);
 		}
 		return null;
 	}
@@ -543,6 +539,7 @@ public abstract class BeanUtils {
 		if (targetType == null || targetType.isArray() || unknownEditorTypes.contains(targetType)) {
 			return null;
 		}
+
 		ClassLoader cl = targetType.getClassLoader();
 		if (cl == null) {
 			try {
@@ -553,34 +550,29 @@ public abstract class BeanUtils {
 			}
 			catch (Throwable ex) {
 				// e.g. AccessControlException on Google App Engine
-				if (logger.isDebugEnabled()) {
-					logger.debug("Could not access system ClassLoader: " + ex);
-				}
 				return null;
 			}
 		}
+
 		String targetTypeName = targetType.getName();
 		String editorName = targetTypeName + "Editor";
 		try {
 			Class<?> editorClass = cl.loadClass(editorName);
-			if (!PropertyEditor.class.isAssignableFrom(editorClass)) {
-				if (logger.isInfoEnabled()) {
-					logger.info("Editor class [" + editorName +
-							"] does not implement [java.beans.PropertyEditor] interface");
+			if (editorClass != null) {
+				if (!PropertyEditor.class.isAssignableFrom(editorClass)) {
+					unknownEditorTypes.add(targetType);
+					return null;
 				}
-				unknownEditorTypes.add(targetType);
-				return null;
+				return (PropertyEditor) instantiateClass(editorClass);
 			}
-			return (PropertyEditor) instantiateClass(editorClass);
+			// Misbehaving ClassLoader returned null instead of ClassNotFoundException
+			// - fall back to unknown editor type registration below
 		}
 		catch (ClassNotFoundException ex) {
-			if (logger.isTraceEnabled()) {
-				logger.trace("No property editor [" + editorName + "] found for type " +
-						targetTypeName + " according to 'Editor' suffix convention");
-			}
-			unknownEditorTypes.add(targetType);
-			return null;
+			// Ignore - fall back to unknown editor type registration below
 		}
+		unknownEditorTypes.add(targetType);
+		return null;
 	}
 
 	/**
@@ -772,7 +764,14 @@ public abstract class BeanUtils {
 					if (readMethod != null) {
 						ResolvableType sourceResolvableType = ResolvableType.forMethodReturnType(readMethod);
 						ResolvableType targetResolvableType = ResolvableType.forMethodParameter(writeMethod, 0);
-						if (targetResolvableType.isAssignableFrom(sourceResolvableType)) {
+
+						// Ignore generic types in assignable check if either ResolvableType has unresolvable generics.
+						boolean isAssignable =
+								(sourceResolvableType.hasUnresolvableGenerics() || targetResolvableType.hasUnresolvableGenerics() ?
+										ClassUtils.isAssignable(writeMethod.getParameterTypes()[0], readMethod.getReturnType()) :
+										targetResolvableType.isAssignableFrom(sourceResolvableType));
+
+						if (isAssignable) {
 							try {
 								if (!Modifier.isPublic(readMethod.getDeclaringClass().getModifiers())) {
 									readMethod.setAccessible(true);

spring-beans/src/main/java/org/springframework/beans/GenericTypeAwarePropertyDescriptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -138,7 +138,7 @@ final class GenericTypeAwarePropertyDescriptor extends PropertyDescriptor {
 		Set<Method> ambiguousCandidates = this.ambiguousWriteMethods;
 		if (ambiguousCandidates != null) {
 			this.ambiguousWriteMethods = null;
-			LogFactory.getLog(GenericTypeAwarePropertyDescriptor.class).warn("Invalid JavaBean property '" +
+			LogFactory.getLog(GenericTypeAwarePropertyDescriptor.class).debug("Non-unique JavaBean property '" +
 					getName() + "' being accessed! Ambiguous write methods found next to actually used [" +
 					this.writeMethod + "]: " + ambiguousCandidates);
 		}

spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java

@@ -247,14 +247,14 @@ class TypeConverterDelegate {
 				// Definitely doesn't match: throw IllegalArgumentException/IllegalStateException
 				StringBuilder msg = new StringBuilder();
 				msg.append("Cannot convert value of type '").append(ClassUtils.getDescriptiveType(newValue));
-				msg.append("' to required type '").append(ClassUtils.getQualifiedName(requiredType)).append("'");
+				msg.append("' to required type '").append(ClassUtils.getQualifiedName(requiredType)).append('\'');
 				if (propertyName != null) {
-					msg.append(" for property '").append(propertyName).append("'");
+					msg.append(" for property '").append(propertyName).append('\'');
 				}
 				if (editor != null) {
 					msg.append(": PropertyEditor [").append(editor.getClass().getName()).append(
 							"] returned inappropriate value of type '").append(
-							ClassUtils.getDescriptiveType(convertedValue)).append("'");
+							ClassUtils.getDescriptiveType(convertedValue)).append('\'');
 					throw new IllegalArgumentException(msg.toString());
 				}
 				else {

spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -41,10 +41,10 @@ public class TypeMismatchException extends PropertyAccessException {
 	private String propertyName;
 
 	@Nullable
-	private transient Object value;
+	private final transient Object value;
 
 	@Nullable
-	private Class<?> requiredType;
+	private final Class<?> requiredType;
 
 
 	/**

spring-beans/src/main/java/org/springframework/beans/factory/BeanFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -84,7 +84,7 @@ import org.springframework.lang.Nullable;
  * (only applicable when running in a web application context)
  * <li>{@code postProcessBeforeInitialization} methods of BeanPostProcessors
  * <li>InitializingBean's {@code afterPropertiesSet}
- * <li>a custom init-method definition
+ * <li>a custom {@code init-method} definition
  * <li>{@code postProcessAfterInitialization} methods of BeanPostProcessors
  * </ol>
  *
@@ -92,7 +92,7 @@ import org.springframework.lang.Nullable;
  * <ol>
  * <li>{@code postProcessBeforeDestruction} methods of DestructionAwareBeanPostProcessors
  * <li>DisposableBean's {@code destroy}
- * <li>a custom destroy-method definition
+ * <li>a custom {@code destroy-method} definition
  * </ol>
  *
  * @author Rod Johnson
@@ -102,6 +102,8 @@ import org.springframework.lang.Nullable;
  * @see BeanNameAware#setBeanName
  * @see BeanClassLoaderAware#setBeanClassLoader
  * @see BeanFactoryAware#setBeanFactory
+ * @see org.springframework.context.EnvironmentAware#setEnvironment
+ * @see org.springframework.context.EmbeddedValueResolverAware#setEmbeddedValueResolver
  * @see org.springframework.context.ResourceLoaderAware#setResourceLoader
  * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher
  * @see org.springframework.context.MessageSourceAware#setMessageSource
@@ -111,6 +113,7 @@ import org.springframework.lang.Nullable;
  * @see InitializingBean#afterPropertiesSet
  * @see org.springframework.beans.factory.support.RootBeanDefinition#getInitMethodName
  * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization
+ * @see org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor#postProcessBeforeDestruction
  * @see DisposableBean#destroy
  * @see org.springframework.beans.factory.support.RootBeanDefinition#getDestroyMethodName
  */

spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -628,45 +628,58 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 			Field field = (Field) this.member;
 			Object value;
 			if (this.cached) {
-				value = resolvedCachedArgument(beanName, this.cachedFieldValue);
+				try {
+					value = resolvedCachedArgument(beanName, this.cachedFieldValue);
+				}
+				catch (NoSuchBeanDefinitionException ex) {
+					// Unexpected removal of target bean for cached argument -> re-resolve
+					value = resolveFieldValue(field, bean, beanName);
+				}
 			}
 			else {
-				DependencyDescriptor desc = new DependencyDescriptor(field, this.required);
-				desc.setContainingClass(bean.getClass());
-				Set<String> autowiredBeanNames = new LinkedHashSet<>(1);
-				Assert.state(beanFactory != null, "No BeanFactory available");
-				TypeConverter typeConverter = beanFactory.getTypeConverter();
-				try {
-					value = beanFactory.resolveDependency(desc, beanName, autowiredBeanNames, typeConverter);
-				}
-				catch (BeansException ex) {
-					throw new UnsatisfiedDependencyException(null, beanName, new InjectionPoint(field), ex);
-				}
-				synchronized (this) {
-					if (!this.cached) {
-						Object cachedFieldValue = null;
-						if (value != null || this.required) {
-							cachedFieldValue = desc;
-							registerDependentBeans(beanName, autowiredBeanNames);
-							if (autowiredBeanNames.size() == 1) {
-								String autowiredBeanName = autowiredBeanNames.iterator().next();
-								if (beanFactory.containsBean(autowiredBeanName) &&
-										beanFactory.isTypeMatch(autowiredBeanName, field.getType())) {
-									cachedFieldValue = new ShortcutDependencyDescriptor(
-											desc, autowiredBeanName, field.getType());
-								}
-							}
-						}
-						this.cachedFieldValue = cachedFieldValue;
-						this.cached = true;
-					}
-				}
+				value = resolveFieldValue(field, bean, beanName);
 			}
 			if (value != null) {
 				ReflectionUtils.makeAccessible(field);
 				field.set(bean, value);
 			}
 		}
+
+		@Nullable
+		private Object resolveFieldValue(Field field, Object bean, @Nullable String beanName) {
+			DependencyDescriptor desc = new DependencyDescriptor(field, this.required);
+			desc.setContainingClass(bean.getClass());
+			Set<String> autowiredBeanNames = new LinkedHashSet<>(1);
+			Assert.state(beanFactory != null, "No BeanFactory available");
+			TypeConverter typeConverter = beanFactory.getTypeConverter();
+			Object value;
+			try {
+				value = beanFactory.resolveDependency(desc, beanName, autowiredBeanNames, typeConverter);
+			}
+			catch (BeansException ex) {
+				throw new UnsatisfiedDependencyException(null, beanName, new InjectionPoint(field), ex);
+			}
+			synchronized (this) {
+				if (!this.cached) {
+					Object cachedFieldValue = null;
+					if (value != null || this.required) {
+						cachedFieldValue = desc;
+						registerDependentBeans(beanName, autowiredBeanNames);
+						if (autowiredBeanNames.size() == 1) {
+							String autowiredBeanName = autowiredBeanNames.iterator().next();
+							if (beanFactory.containsBean(autowiredBeanName) &&
+									beanFactory.isTypeMatch(autowiredBeanName, field.getType())) {
+								cachedFieldValue = new ShortcutDependencyDescriptor(
+										desc, autowiredBeanName, field.getType());
+							}
+						}
+					}
+					this.cachedFieldValue = cachedFieldValue;
+					this.cached = true;
+				}
+			}
+			return value;
+		}
 	}
 
 
@@ -695,58 +708,16 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 			Method method = (Method) this.member;
 			Object[] arguments;
 			if (this.cached) {
-				// Shortcut for avoiding synchronization...
-				arguments = resolveCachedArguments(beanName);
+				try {
+					arguments = resolveCachedArguments(beanName);
+				}
+				catch (NoSuchBeanDefinitionException ex) {
+					// Unexpected removal of target bean for cached argument -> re-resolve
+					arguments = resolveMethodArguments(method, bean, beanName);
+				}
 			}
 			else {
-				int argumentCount = method.getParameterCount();
-				arguments = new Object[argumentCount];
-				DependencyDescriptor[] descriptors = new DependencyDescriptor[argumentCount];
-				Set<String> autowiredBeans = new LinkedHashSet<>(argumentCount);
-				Assert.state(beanFactory != null, "No BeanFactory available");
-				TypeConverter typeConverter = beanFactory.getTypeConverter();
-				for (int i = 0; i < arguments.length; i++) {
-					MethodParameter methodParam = new MethodParameter(method, i);
-					DependencyDescriptor currDesc = new DependencyDescriptor(methodParam, this.required);
-					currDesc.setContainingClass(bean.getClass());
-					descriptors[i] = currDesc;
-					try {
-						Object arg = beanFactory.resolveDependency(currDesc, beanName, autowiredBeans, typeConverter);
-						if (arg == null && !this.required) {
-							arguments = null;
-							break;
-						}
-						arguments[i] = arg;
-					}
-					catch (BeansException ex) {
-						throw new UnsatisfiedDependencyException(null, beanName, new InjectionPoint(methodParam), ex);
-					}
-				}
-				synchronized (this) {
-					if (!this.cached) {
-						if (arguments != null) {
-							DependencyDescriptor[] cachedMethodArguments = Arrays.copyOf(descriptors, arguments.length);
-							registerDependentBeans(beanName, autowiredBeans);
-							if (autowiredBeans.size() == argumentCount) {
-								Iterator<String> it = autowiredBeans.iterator();
-								Class<?>[] paramTypes = method.getParameterTypes();
-								for (int i = 0; i < paramTypes.length; i++) {
-									String autowiredBeanName = it.next();
-									if (beanFactory.containsBean(autowiredBeanName) &&
-											beanFactory.isTypeMatch(autowiredBeanName, paramTypes[i])) {
-										cachedMethodArguments[i] = new ShortcutDependencyDescriptor(
-												descriptors[i], autowiredBeanName, paramTypes[i]);
-									}
-								}
-							}
-							this.cachedMethodArguments = cachedMethodArguments;
-						}
-						else {
-							this.cachedMethodArguments = null;
-						}
-						this.cached = true;
-					}
-				}
+				arguments = resolveMethodArguments(method, bean, beanName);
 			}
 			if (arguments != null) {
 				try {
@@ -771,6 +742,59 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 			}
 			return arguments;
 		}
+
+		@Nullable
+		private Object[] resolveMethodArguments(Method method, Object bean, @Nullable String beanName) {
+			int argumentCount = method.getParameterCount();
+			Object[] arguments = new Object[argumentCount];
+			DependencyDescriptor[] descriptors = new DependencyDescriptor[argumentCount];
+			Set<String> autowiredBeans = new LinkedHashSet<>(argumentCount);
+			Assert.state(beanFactory != null, "No BeanFactory available");
+			TypeConverter typeConverter = beanFactory.getTypeConverter();
+			for (int i = 0; i < arguments.length; i++) {
+				MethodParameter methodParam = new MethodParameter(method, i);
+				DependencyDescriptor currDesc = new DependencyDescriptor(methodParam, this.required);
+				currDesc.setContainingClass(bean.getClass());
+				descriptors[i] = currDesc;
+				try {
+					Object arg = beanFactory.resolveDependency(currDesc, beanName, autowiredBeans, typeConverter);
+					if (arg == null && !this.required) {
+						arguments = null;
+						break;
+					}
+					arguments[i] = arg;
+				}
+				catch (BeansException ex) {
+					throw new UnsatisfiedDependencyException(null, beanName, new InjectionPoint(methodParam), ex);
+				}
+			}
+			synchronized (this) {
+				if (!this.cached) {
+					if (arguments != null) {
+						DependencyDescriptor[] cachedMethodArguments = Arrays.copyOf(descriptors, arguments.length);
+						registerDependentBeans(beanName, autowiredBeans);
+						if (autowiredBeans.size() == argumentCount) {
+							Iterator<String> it = autowiredBeans.iterator();
+							Class<?>[] paramTypes = method.getParameterTypes();
+							for (int i = 0; i < paramTypes.length; i++) {
+								String autowiredBeanName = it.next();
+								if (beanFactory.containsBean(autowiredBeanName) &&
+										beanFactory.isTypeMatch(autowiredBeanName, paramTypes[i])) {
+									cachedMethodArguments[i] = new ShortcutDependencyDescriptor(
+											descriptors[i], autowiredBeanName, paramTypes[i]);
+								}
+							}
+						}
+						this.cachedMethodArguments = cachedMethodArguments;
+					}
+					else {
+						this.cachedMethodArguments = null;
+					}
+					this.cached = true;
+				}
+			}
+			return arguments;
+		}
 	}
 
 

spring-beans/src/main/java/org/springframework/beans/factory/annotation/RequiredAnnotationBeanPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -217,13 +217,13 @@ public class RequiredAnnotationBeanPostProcessor implements SmartInstantiationAw
 					sb.append(" and");
 				}
 				else {
-					sb.append(",");
+					sb.append(',');
 				}
 			}
-			sb.append(" '").append(propertyName).append("'");
+			sb.append(" '").append(propertyName).append('\'');
 		}
 		sb.append(size == 1 ? " is" : " are");
-		sb.append(" required for bean '").append(beanName).append("'");
+		sb.append(" required for bean '").append(beanName).append('\'');
 		return sb.toString();
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/config/ConstructorArgumentValues.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -351,7 +351,9 @@ public class ConstructorArgumentValues {
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	@Nullable
-	public ValueHolder getArgumentValue(int index, @Nullable Class<?> requiredType, @Nullable String requiredName, @Nullable Set<ValueHolder> usedValueHolders) {
+	public ValueHolder getArgumentValue(int index, @Nullable Class<?> requiredType,
+			@Nullable String requiredName, @Nullable Set<ValueHolder> usedValueHolders) {
+
 		Assert.isTrue(index >= 0, "Index must not be negative");
 		ValueHolder valueHolder = getIndexedArgumentValue(index, requiredType, requiredName);
 		if (valueHolder == null) {

spring-beans/src/main/java/org/springframework/beans/factory/config/PlaceholderConfigurerSupport.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -36,15 +36,16 @@ import org.springframework.util.StringValueResolver;
  * Example XML bean definition:
  *
  * <pre class="code">
- * &lt;bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"/&gt;
- *   &lt;property name="driverClassName" value="${driver}"/&gt;
- *   &lt;property name="url" value="jdbc:${dbname}"/&gt;
+ * &lt;bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"&gt;
+ *   &lt;property name="driverClassName" value="${driver}" /&gt;
+ *   &lt;property name="url" value="jdbc:${dbname}" /&gt;
  * &lt;/bean&gt;
  * </pre>
  *
  * Example properties file:
  *
- * <pre class="code">driver=com.mysql.jdbc.Driver
+ * <pre class="code">
+ * driver=com.mysql.jdbc.Driver
  * dbname=mysql:mydb</pre>
  *
  * Annotated bean definitions may take advantage of property replacement using
@@ -56,7 +57,8 @@ import org.springframework.util.StringValueResolver;
  * in bean references. Furthermore, placeholder values can also cross-reference
  * other placeholders, like:
  *
- * <pre class="code">rootPath=myrootdir
+ * <pre class="code">
+ * rootPath=myrootdir
  * subPath=${rootPath}/subdir</pre>
  *
  * In contrast to {@link PropertyOverrideConfigurer}, subclasses of this type allow
@@ -71,13 +73,13 @@ import org.springframework.util.StringValueResolver;
  *
  * <p>Default property values can be defined globally for each configurer instance
  * via the {@link #setProperties properties} property, or on a property-by-property basis
- * using the default value separator which is {@code ":"} by default and
- * customizable via {@link #setValueSeparator(String)}.
+ * using the value separator which is {@code ":"} by default and customizable via
+ * {@link #setValueSeparator(String)}.
  *
  * <p>Example XML property with default value:
  *
  * <pre class="code">
- *   <property name="url" value="jdbc:${dbname:defaultdb}"/>
+ *   &lt;property name="url" value="jdbc:${dbname:defaultdb}" /&gt;
  * </pre>
  *
  * @author Chris Beams

spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -52,6 +52,7 @@ import org.springframework.util.StringUtils;
  * @author Dave Syer
  * @author Juergen Hoeller
  * @author Sam Brannen
+ * @author Brian Clozel
  * @since 4.1
  */
 public abstract class YamlProcessor {
@@ -128,10 +129,11 @@ public abstract class YamlProcessor {
 
 	/**
 	 * Set the supported types that can be loaded from YAML documents.
-	 * <p>If no supported types are configured, all types encountered in YAML
-	 * documents will be supported. If an unsupported type is encountered, an
-	 * {@link IllegalStateException} will be thrown when the corresponding YAML
-	 * node is processed.
+	 * <p>If no supported types are configured, only Java standard classes
+	 * (as defined in {@link org.yaml.snakeyaml.constructor.SafeConstructor})
+	 * encountered in YAML documents will be supported.
+	 * If an unsupported type is encountered, an {@link IllegalStateException}
+	 * will be thrown when the corresponding YAML node is processed.
 	 * @param supportedTypes the supported types, or an empty array to clear the
 	 * supported types
 	 * @since 5.1.16
@@ -182,12 +184,8 @@ public abstract class YamlProcessor {
 	protected Yaml createYaml() {
 		LoaderOptions loaderOptions = new LoaderOptions();
 		loaderOptions.setAllowDuplicateKeys(false);
-
-		if (!this.supportedTypes.isEmpty()) {
-			return new Yaml(new FilteringConstructor(loaderOptions), new Representer(),
-					new DumperOptions(), loaderOptions);
-		}
-		return new Yaml(loaderOptions);
+		return new Yaml(new FilteringConstructor(loaderOptions), new Representer(),
+				new DumperOptions(), loaderOptions);
 	}
 
 	private boolean process(MatchCallback callback, Yaml yaml, Resource resource) {

spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -489,9 +489,9 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp
 						resolveConstructorArguments(args, 2, hasClosureArgument ? args.length - 1 : args.length);
 				this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(beanName, (Class<?>) args[1], constructorArgs);
 				Map<?, ?> namedArgs = (Map<?, ?>) args[0];
-				for (Object o : namedArgs.keySet()) {
-					String propName = (String) o;
-					setProperty(propName, namedArgs.get(propName));
+				for (Map.Entry<?, ?> entity : namedArgs.entrySet()) {
+					String propName = (String) entity.getKey();
+					setProperty(propName, entity.getValue());
 				}
 			}
 			// factory method syntax

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -73,6 +73,7 @@ import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.NamedThreadLocal;
+import org.springframework.core.NativeDetector;
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.core.PriorityOrdered;
 import org.springframework.core.ResolvableType;
@@ -123,14 +124,6 @@ import org.springframework.util.StringUtils;
 public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFactory
 		implements AutowireCapableBeanFactory {
 
-	/**
-	 * Whether this environment lives within a native image.
-	 * Exposed as a private static field rather than in a {@code NativeImageDetector.inNativeImage()} static method due to https://github.com/oracle/graal/issues/2594.
-	 * @see <a href="https://github.com/oracle/graal/blob/master/sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/ImageInfo.java">ImageInfo.java</a>
-	 */
-	private static final boolean IN_NATIVE_IMAGE = (System.getProperty("org.graalvm.nativeimage.imagecode") != null);
-
-
 	/** Strategy for creating bean instances. */
 	private InstantiationStrategy instantiationStrategy;
 
@@ -184,7 +177,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		ignoreDependencyInterface(BeanNameAware.class);
 		ignoreDependencyInterface(BeanFactoryAware.class);
 		ignoreDependencyInterface(BeanClassLoaderAware.class);
-		if (IN_NATIVE_IMAGE) {
+		if (NativeDetector.inNativeImage()) {
 			this.instantiationStrategy = new SimpleInstantiationStrategy();
 		}
 		else {
@@ -253,6 +246,15 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		this.allowCircularReferences = allowCircularReferences;
 	}
 
+	/**
+	 * Return whether to allow circular references between beans.
+	 * @since 5.3.10
+	 * @see #setAllowCircularReferences
+	 */
+	public boolean isAllowCircularReferences() {
+		return this.allowCircularReferences;
+	}
+
 	/**
 	 * Set whether to allow the raw injection of a bean instance into some other
 	 * bean's property, despite the injected bean eventually getting wrapped
@@ -271,6 +273,15 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		this.allowRawInjectionDespiteWrapping = allowRawInjectionDespiteWrapping;
 	}
 
+	/**
+	 * Return whether to allow the raw injection of a bean instance.
+	 * @since 5.3.10
+	 * @see #setAllowRawInjectionDespiteWrapping
+	 */
+	public boolean isAllowRawInjectionDespiteWrapping() {
+		return this.allowRawInjectionDespiteWrapping;
+	}
+
 	/**
 	 * Ignore the given dependency type for autowiring:
 	 * for example, String. Default is none.
@@ -1022,6 +1033,11 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 				throw ex;
 			}
 			catch (BeanCreationException ex) {
+				// Don't swallow a linkage error since it contains a full stacktrace on
+				// first occurrence... and just a plain NoClassDefFoundError afterwards.
+				if (ex.contains(LinkageError.class)) {
+					throw ex;
+				}
 				// Instantiation failure, maybe too early...
 				if (logger.isDebugEnabled()) {
 					logger.debug("Bean creation exception on singleton FactoryBean type check: " + ex);

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -894,7 +894,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}
 
 	/**
-	 * Return if there are property values values defined for this bean.
+	 * Return if there are property values defined for this bean.
 	 * @since 5.0.2
 	 */
 	@Override
@@ -1194,8 +1194,8 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 				this.primary == that.primary &&
 				this.nonPublicAccessAllowed == that.nonPublicAccessAllowed &&
 				this.lenientConstructorResolution == that.lenientConstructorResolution &&
-				ObjectUtils.nullSafeEquals(this.constructorArgumentValues, that.constructorArgumentValues) &&
-				ObjectUtils.nullSafeEquals(this.propertyValues, that.propertyValues) &&
+				equalsConstructorArgumentValues(that) &&
+				equalsPropertyValues(that) &&
 				ObjectUtils.nullSafeEquals(this.methodOverrides, that.methodOverrides) &&
 				ObjectUtils.nullSafeEquals(this.factoryBeanName, that.factoryBeanName) &&
 				ObjectUtils.nullSafeEquals(this.factoryMethodName, that.factoryMethodName) &&
@@ -1208,12 +1208,30 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 				super.equals(other));
 	}
 
+	private boolean equalsConstructorArgumentValues(AbstractBeanDefinition other) {
+		if (!hasConstructorArgumentValues()) {
+			return !other.hasConstructorArgumentValues();
+		}
+		return ObjectUtils.nullSafeEquals(this.constructorArgumentValues, other.constructorArgumentValues);
+	}
+
+	private boolean equalsPropertyValues(AbstractBeanDefinition other) {
+		if (!hasPropertyValues()) {
+			return !other.hasPropertyValues();
+		}
+		return ObjectUtils.nullSafeEquals(this.propertyValues, other.propertyValues);
+	}
+
 	@Override
 	public int hashCode() {
 		int hashCode = ObjectUtils.nullSafeHashCode(getBeanClassName());
 		hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.scope);
-		hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.constructorArgumentValues);
-		hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.propertyValues);
+		if (hasConstructorArgumentValues()) {
+			hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.constructorArgumentValues);
+		}
+		if (hasPropertyValues()) {
+			hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.propertyValues);
+		}
 		hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.factoryBeanName);
 		hashCode = 29 * hashCode + ObjectUtils.nullSafeHashCode(this.factoryMethodName);
 		hashCode = 29 * hashCode + super.hashCode();
@@ -1223,7 +1241,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder("class [");
-		sb.append(getBeanClassName()).append("]");
+		sb.append(getBeanClassName()).append(']');
 		sb.append("; scope=").append(this.scope);
 		sb.append("; abstract=").append(this.abstractFlag);
 		sb.append("; lazyInit=").append(this.lazyInit);

spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

@@ -250,7 +250,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 			throws BeansException {
 
 		String beanName = transformedBeanName(name);
-		Object bean;
+		Object beanInstance;
 
 		// Eagerly check singleton cache for manually registered singletons.
 		Object sharedInstance = getSingleton(beanName);
@@ -264,7 +264,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 					logger.trace("Returning cached instance of singleton bean '" + beanName + "'");
 				}
 			}
-			bean = getObjectForBeanInstance(sharedInstance, name, beanName, null);
+			beanInstance = getObjectForBeanInstance(sharedInstance, name, beanName, null);
 		}
 
 		else {
@@ -342,7 +342,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 							throw ex;
 						}
 					});
-					bean = getObjectForBeanInstance(sharedInstance, name, beanName, mbd);
+					beanInstance = getObjectForBeanInstance(sharedInstance, name, beanName, mbd);
 				}
 
 				else if (mbd.isPrototype()) {
@@ -355,7 +355,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 					finally {
 						afterPrototypeCreation(beanName);
 					}
-					bean = getObjectForBeanInstance(prototypeInstance, name, beanName, mbd);
+					beanInstance = getObjectForBeanInstance(prototypeInstance, name, beanName, mbd);
 				}
 
 				else {
@@ -377,7 +377,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 								afterPrototypeCreation(beanName);
 							}
 						});
-						bean = getObjectForBeanInstance(scopedInstance, name, beanName, mbd);
+						beanInstance = getObjectForBeanInstance(scopedInstance, name, beanName, mbd);
 					}
 					catch (IllegalStateException ex) {
 						throw new ScopeNotActiveException(beanName, scopeName, ex);
@@ -395,14 +395,19 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 			}
 		}
 
+		return adaptBeanInstance(name, beanInstance, requiredType);
+	}
+
+	@SuppressWarnings("unchecked")
+	<T> T adaptBeanInstance(String name, Object bean, @Nullable Class<?> requiredType) {
 		// Check if required type matches the type of the actual bean instance.
 		if (requiredType != null && !requiredType.isInstance(bean)) {
 			try {
-				T convertedBean = getTypeConverter().convertIfNecessary(bean, requiredType);
+				Object convertedBean = getTypeConverter().convertIfNecessary(bean, requiredType);
 				if (convertedBean == null) {
 					throw new BeanNotOfRequiredTypeException(name, requiredType, bean.getClass());
 				}
-				return convertedBean;
+				return (T) convertedBean;
 			}
 			catch (TypeMismatchException ex) {
 				if (logger.isTraceEnabled()) {

spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -21,6 +21,7 @@ import java.util.function.Supplier;
 import org.springframework.beans.factory.config.AutowiredPropertyMarker;
 import org.springframework.beans.factory.config.BeanDefinitionCustomizer;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
@@ -102,7 +103,7 @@ public final class BeanDefinitionBuilder {
 	 * @param beanClass the {@code Class} of the bean that the definition is being created for
 	 */
 	public static BeanDefinitionBuilder rootBeanDefinition(Class<?> beanClass) {
-		return rootBeanDefinition(beanClass, null);
+		return rootBeanDefinition(beanClass, (String) null);
 	}
 
 	/**
@@ -117,6 +118,30 @@ public final class BeanDefinitionBuilder {
 		return builder;
 	}
 
+	/**
+	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link RootBeanDefinition}.
+	 * @param beanType the {@link ResolvableType type} of the bean that the definition is being created for
+	 * @param instanceSupplier a callback for creating an instance of the bean
+	 * @since 5.3.9
+	 */
+	public static <T> BeanDefinitionBuilder rootBeanDefinition(ResolvableType beanType, Supplier<T> instanceSupplier) {
+		RootBeanDefinition beanDefinition = new RootBeanDefinition();
+		beanDefinition.setTargetType(beanType);
+		beanDefinition.setInstanceSupplier(instanceSupplier);
+		return new BeanDefinitionBuilder(beanDefinition);
+	}
+
+	/**
+	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link RootBeanDefinition}.
+	 * @param beanClass the {@code Class} of the bean that the definition is being created for
+	 * @param instanceSupplier a callback for creating an instance of the bean
+	 * @since 5.3.9
+	 * @see #rootBeanDefinition(ResolvableType, Supplier)
+	 */
+	public static <T> BeanDefinitionBuilder rootBeanDefinition(Class<T> beanClass, Supplier<T> instanceSupplier) {
+		return rootBeanDefinition(ResolvableType.forClass(beanClass), instanceSupplier);
+	}
+
 	/**
 	 * Create a new {@code BeanDefinitionBuilder} used to construct a {@link ChildBeanDefinition}.
 	 * @param parentName the name of the parent bean
@@ -331,6 +356,16 @@ public final class BeanDefinitionBuilder {
 		return this;
 	}
 
+	/**
+	 * Set whether this bean is 'synthetic', that is, not defined by
+	 * the application itself.
+	 * @since 5.3.9
+	 */
+	public BeanDefinitionBuilder setSynthetic(boolean synthetic) {
+		this.beanDefinition.setSynthetic(synthetic);
+		return this;
+	}
+
 	/**
 	 * Apply the given customizers to the underlying bean definition.
 	 * @since 5.0

spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -35,6 +35,7 @@ import org.springframework.cglib.proxy.Factory;
 import org.springframework.cglib.proxy.MethodInterceptor;
 import org.springframework.cglib.proxy.MethodProxy;
 import org.springframework.cglib.proxy.NoOp;
+import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -244,8 +245,10 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 				return (bean.equals(null) ? null : bean);
 			}
 			else {
-				return (argsToUse != null ? this.owner.getBean(method.getReturnType(), argsToUse) :
-						this.owner.getBean(method.getReturnType()));
+				// Find target bean matching the (potentially generic) method return type
+				ResolvableType genericReturnType = ResolvableType.forMethodReturnType(method);
+				return (argsToUse != null ? this.owner.getBeanProvider(genericReturnType).getObject(argsToUse) :
+						this.owner.getBeanProvider(genericReturnType).getObject());
 			}
 		}
 	}

spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -277,12 +277,12 @@ class ConstructorResolver {
 					throw ex;
 				}
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
-						"Could not resolve matching constructor " +
+						"Could not resolve matching constructor on bean class [" + mbd.getBeanClassName() + "] " +
 						"(hint: specify index/type/name arguments for simple parameters to avoid type ambiguities)");
 			}
 			else if (ambiguousConstructors != null && !mbd.isLenientConstructorResolution()) {
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
-						"Ambiguous constructor matches found in bean '" + beanName + "' " +
+						"Ambiguous constructor matches found on bean class [" + mbd.getBeanClassName() + "] " +
 						"(hint: specify index/type/name arguments for simple parameters to avoid type ambiguities): " +
 						ambiguousConstructors);
 			}
@@ -608,7 +608,7 @@ class ConstructorResolver {
 				}
 				String argDesc = StringUtils.collectionToCommaDelimitedString(argTypes);
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
-						"No matching factory method found: " +
+						"No matching factory method found on class [" + factoryClass.getName() + "]: " +
 						(mbd.getFactoryBeanName() != null ?
 							"factory bean '" + mbd.getFactoryBeanName() + "'; " : "") +
 						"factory method '" + mbd.getFactoryMethodName() + "(" + argDesc + ")'. " +
@@ -619,12 +619,12 @@ class ConstructorResolver {
 			}
 			else if (void.class == factoryMethodToUse.getReturnType()) {
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
-						"Invalid factory method '" + mbd.getFactoryMethodName() +
-						"': needs to have a non-void return type!");
+						"Invalid factory method '" + mbd.getFactoryMethodName() + "' on class [" +
+						factoryClass.getName() + "]: needs to have a non-void return type!");
 			}
 			else if (ambiguousFactoryMethods != null) {
 				throw new BeanCreationException(mbd.getResourceDescription(), beanName,
-						"Ambiguous factory method matches found in bean '" + beanName + "' " +
+						"Ambiguous factory method matches found on class [" + factoryClass.getName() + "] " +
 						"(hint: specify index/type/name arguments for simple parameters to avoid type ambiguities): " +
 						ambiguousFactoryMethods);
 			}

spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

@@ -1231,8 +1231,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		}
 
 		if (candidateNames.length == 1) {
-			String beanName = candidateNames[0];
-			return new NamedBeanHolder<>(beanName, (T) getBean(beanName, requiredType.toClass(), args));
+			return resolveNamedBean(candidateNames[0], requiredType, args);
 		}
 		else if (candidateNames.length > 1) {
 			Map<String, Object> candidates = CollectionUtils.newLinkedHashMap(candidateNames.length);
@@ -1251,8 +1250,11 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 			}
 			if (candidateName != null) {
 				Object beanInstance = candidates.get(candidateName);
-				if (beanInstance == null || beanInstance instanceof Class) {
-					beanInstance = getBean(candidateName, requiredType.toClass(), args);
+				if (beanInstance == null) {
+					return null;
+				}
+				if (beanInstance instanceof Class) {
+					return resolveNamedBean(candidateName, requiredType, args);
 				}
 				return new NamedBeanHolder<>(candidateName, (T) beanInstance);
 			}
@@ -1264,6 +1266,17 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
 		return null;
 	}
 
+	@Nullable
+	private <T> NamedBeanHolder<T> resolveNamedBean(
+			String beanName, ResolvableType requiredType, @Nullable Object[] args) throws BeansException {
+
+		Object bean = getBean(beanName, null, args);
+		if (bean instanceof NullBean) {
+			return null;
+		}
+		return new NamedBeanHolder<T>(beanName, adaptBeanInstance(beanName, bean, requiredType.toClass()));
+	}
+
 	@Override
 	@Nullable
 	public Object resolveDependency(DependencyDescriptor descriptor, @Nullable String requestingBeanName,

spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -119,14 +119,16 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 				}
 			}
 			else {
-				Class<?>[] paramTypes = destroyMethod.getParameterTypes();
-				if (paramTypes.length > 1) {
-					throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
-							beanName + "' has more than one parameter - not supported as destroy method");
-				}
-				else if (paramTypes.length == 1 && boolean.class != paramTypes[0]) {
-					throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
-							beanName + "' has a non-boolean parameter - not supported as destroy method");
+				if (destroyMethod.getParameterCount() > 0) {
+					Class<?>[] paramTypes = destroyMethod.getParameterTypes();
+					if (paramTypes.length > 1) {
+						throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
+								beanName + "' has more than one parameter - not supported as destroy method");
+					}
+					else if (paramTypes.length == 1 && boolean.class != paramTypes[0]) {
+						throw new BeanDefinitionValidationException("Method '" + destroyMethodName + "' of bean '" +
+								beanName + "' has a non-boolean parameter - not supported as destroy method");
+					}
 				}
 				destroyMethod = ClassUtils.getInterfaceMethodIfPossible(destroyMethod);
 			}
@@ -170,66 +172,6 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 	}
 
 
-	/**
-	 * If the current value of the given beanDefinition's "destroyMethodName" property is
-	 * {@link AbstractBeanDefinition#INFER_METHOD}, then attempt to infer a destroy method.
-	 * Candidate methods are currently limited to public, no-arg methods named "close" or
-	 * "shutdown" (whether declared locally or inherited). The given BeanDefinition's
-	 * "destroyMethodName" is updated to be null if no such method is found, otherwise set
-	 * to the name of the inferred method. This constant serves as the default for the
-	 * {@code @Bean#destroyMethod} attribute and the value of the constant may also be
-	 * used in XML within the {@code <bean destroy-method="">} or {@code
-	 * <beans default-destroy-method="">} attributes.
-	 * <p>Also processes the {@link java.io.Closeable} and {@link java.lang.AutoCloseable}
-	 * interfaces, reflectively calling the "close" method on implementing beans as well.
-	 */
-	@Nullable
-	private String inferDestroyMethodIfNecessary(Object bean, RootBeanDefinition beanDefinition) {
-		String destroyMethodName = beanDefinition.getDestroyMethodName();
-		if (AbstractBeanDefinition.INFER_METHOD.equals(destroyMethodName) ||
-				(destroyMethodName == null && bean instanceof AutoCloseable)) {
-			// Only perform destroy method inference or Closeable detection
-			// in case of the bean not explicitly implementing DisposableBean
-			if (!(bean instanceof DisposableBean)) {
-				try {
-					return bean.getClass().getMethod(CLOSE_METHOD_NAME).getName();
-				}
-				catch (NoSuchMethodException ex) {
-					try {
-						return bean.getClass().getMethod(SHUTDOWN_METHOD_NAME).getName();
-					}
-					catch (NoSuchMethodException ex2) {
-						// no candidate destroy method found
-					}
-				}
-			}
-			return null;
-		}
-		return (StringUtils.hasLength(destroyMethodName) ? destroyMethodName : null);
-	}
-
-	/**
-	 * Search for all DestructionAwareBeanPostProcessors in the List.
-	 * @param processors the List to search
-	 * @return the filtered List of DestructionAwareBeanPostProcessors
-	 */
-	@Nullable
-	private List<DestructionAwareBeanPostProcessor> filterPostProcessors(
-			List<DestructionAwareBeanPostProcessor> processors, Object bean) {
-
-		List<DestructionAwareBeanPostProcessor> filteredPostProcessors = null;
-		if (!CollectionUtils.isEmpty(processors)) {
-			filteredPostProcessors = new ArrayList<>(processors.size());
-			for (DestructionAwareBeanPostProcessor processor : processors) {
-				if (processor.requiresDestruction(bean)) {
-					filteredPostProcessors.add(processor);
-				}
-			}
-		}
-		return filteredPostProcessors;
-	}
-
-
 	@Override
 	public void run() {
 		destroy();
@@ -384,12 +326,50 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 		if (bean instanceof DisposableBean || bean instanceof AutoCloseable) {
 			return true;
 		}
-		String destroyMethodName = beanDefinition.getDestroyMethodName();
-		if (AbstractBeanDefinition.INFER_METHOD.equals(destroyMethodName)) {
-			return (ClassUtils.hasMethod(bean.getClass(), CLOSE_METHOD_NAME) ||
-					ClassUtils.hasMethod(bean.getClass(), SHUTDOWN_METHOD_NAME));
+		return inferDestroyMethodIfNecessary(bean, beanDefinition) != null;
+	}
+
+
+	/**
+	 * If the current value of the given beanDefinition's "destroyMethodName" property is
+	 * {@link AbstractBeanDefinition#INFER_METHOD}, then attempt to infer a destroy method.
+	 * Candidate methods are currently limited to public, no-arg methods named "close" or
+	 * "shutdown" (whether declared locally or inherited). The given BeanDefinition's
+	 * "destroyMethodName" is updated to be null if no such method is found, otherwise set
+	 * to the name of the inferred method. This constant serves as the default for the
+	 * {@code @Bean#destroyMethod} attribute and the value of the constant may also be
+	 * used in XML within the {@code <bean destroy-method="">} or {@code
+	 * <beans default-destroy-method="">} attributes.
+	 * <p>Also processes the {@link java.io.Closeable} and {@link java.lang.AutoCloseable}
+	 * interfaces, reflectively calling the "close" method on implementing beans as well.
+	 */
+	@Nullable
+	private static String inferDestroyMethodIfNecessary(Object bean, RootBeanDefinition beanDefinition) {
+		String destroyMethodName = beanDefinition.resolvedDestroyMethodName;
+		if (destroyMethodName == null) {
+			destroyMethodName = beanDefinition.getDestroyMethodName();
+			if (AbstractBeanDefinition.INFER_METHOD.equals(destroyMethodName) ||
+					(destroyMethodName == null && bean instanceof AutoCloseable)) {
+				// Only perform destroy method inference or Closeable detection
+				// in case of the bean not explicitly implementing DisposableBean
+				destroyMethodName = null;
+				if (!(bean instanceof DisposableBean)) {
+					try {
+						destroyMethodName = bean.getClass().getMethod(CLOSE_METHOD_NAME).getName();
+					}
+					catch (NoSuchMethodException ex) {
+						try {
+							destroyMethodName = bean.getClass().getMethod(SHUTDOWN_METHOD_NAME).getName();
+						}
+						catch (NoSuchMethodException ex2) {
+							// no candidate destroy method found
+						}
+					}
+				}
+			}
+			beanDefinition.resolvedDestroyMethodName = (destroyMethodName != null ? destroyMethodName : "");
 		}
-		return StringUtils.hasLength(destroyMethodName);
+		return (StringUtils.hasLength(destroyMethodName) ? destroyMethodName : null);
 	}
 
 	/**
@@ -408,4 +388,25 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 		return false;
 	}
 
+	/**
+	 * Search for all DestructionAwareBeanPostProcessors in the List.
+	 * @param processors the List to search
+	 * @return the filtered List of DestructionAwareBeanPostProcessors
+	 */
+	@Nullable
+	private static List<DestructionAwareBeanPostProcessor> filterPostProcessors(
+			List<DestructionAwareBeanPostProcessor> processors, Object bean) {
+
+		List<DestructionAwareBeanPostProcessor> filteredPostProcessors = null;
+		if (!CollectionUtils.isEmpty(processors)) {
+			filteredPostProcessors = new ArrayList<>(processors.size());
+			for (DestructionAwareBeanPostProcessor processor : processors) {
+				if (processor.requiresDestruction(bean)) {
+					filteredPostProcessors.add(processor);
+				}
+			}
+		}
+		return filteredPostProcessors;
+	}
+
 }

spring-beans/src/main/java/org/springframework/beans/factory/support/LookupOverride.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 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.
@@ -19,17 +19,25 @@ package org.springframework.beans.factory.support;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
+import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
 /**
- * Represents an override of a method that looks up an object in the same IoC context.
+ * Represents an override of a method that looks up an object in the same IoC context,
+ * either by bean name or by bean type (based on the declared method return type).
  *
- * <p>Methods eligible for lookup override must not have arguments.
+ * <p>Methods eligible for lookup override may declare arguments in which case the
+ * given arguments are passed to the bean retrieval operation.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
  * @since 1.1
+ * @see org.springframework.beans.factory.BeanFactory#getBean(String)
+ * @see org.springframework.beans.factory.BeanFactory#getBean(Class)
+ * @see org.springframework.beans.factory.BeanFactory#getBean(String, Object...)
+ * @see org.springframework.beans.factory.BeanFactory#getBean(Class, Object...)
+ * @see org.springframework.beans.factory.BeanFactory#getBeanProvider(ResolvableType)
  */
 public class LookupOverride extends MethodOverride {
 
@@ -43,8 +51,8 @@ public class LookupOverride extends MethodOverride {
 	/**
 	 * Construct a new LookupOverride.
 	 * @param methodName the name of the method to override
-	 * @param beanName the name of the bean in the current {@code BeanFactory}
-	 * that the overridden method should return (may be {@code null})
+	 * @param beanName the name of the bean in the current {@code BeanFactory} that the
+	 * overridden method should return (may be {@code null} for type-based bean retrieval)
 	 */
 	public LookupOverride(String methodName, @Nullable String beanName) {
 		super(methodName);
@@ -53,9 +61,9 @@ public class LookupOverride extends MethodOverride {
 
 	/**
 	 * Construct a new LookupOverride.
-	 * @param method the method to override
-	 * @param beanName the name of the bean in the current {@code BeanFactory}
-	 * that the overridden method should return (may be {@code null})
+	 * @param method the method declaration to override
+	 * @param beanName the name of the bean in the current {@code BeanFactory} that the
+	 * overridden method should return (may be {@code null} for type-based bean retrieval)
 	 */
 	public LookupOverride(Method method, @Nullable String beanName) {
 		super(method.getName());

spring-beans/src/main/java/org/springframework/beans/factory/support/MethodReplacer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -19,9 +19,8 @@ package org.springframework.beans.factory.support;
 import java.lang.reflect.Method;
 
 /**
- * Interface to be implemented by classes that can reimplement any method
- * on an IoC-managed object: the <b>Method Injection</b> form of
- * Dependency Injection.
+ * Interface to be implemented by classes that can reimplement any method on an
+ * IoC-managed object: the <b>Method Injection</b> form of Dependency Injection.
  *
  * <p>Such methods may be (but need not be) abstract, in which case the
  * container will create a concrete subclass to instantiate.

spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 /**
- * Extension of MethodOverride that represents an arbitrary
+ * Extension of {@link MethodOverride} that represents an arbitrary
  * override of a method by the IoC container.
  *
  * <p>Any non-final method can be overridden, irrespective of its
@@ -45,7 +45,7 @@ public class ReplaceOverride extends MethodOverride {
 	/**
 	 * Construct a new ReplaceOverride.
 	 * @param methodName the name of the method to override
-	 * @param methodReplacerBeanName the bean name of the MethodReplacer
+	 * @param methodReplacerBeanName the bean name of the {@link MethodReplacer}
 	 */
 	public ReplaceOverride(String methodName, String methodReplacerBeanName) {
 		super(methodName);

spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -86,6 +86,10 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
 	@Nullable
 	volatile Method factoryMethodToIntrospect;
 
+	/** Package-visible field for caching a resolved destroy method name (also for inferred). */
+	@Nullable
+	volatile String resolvedDestroyMethodName;
+
 	/** Common lock for the four constructor fields below. */
 	final Object constructorArgumentLock = new Object();
 

spring-beans/src/main/java/org/springframework/beans/propertyeditors/LocaleEditor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 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.
@@ -23,9 +23,9 @@ import org.springframework.util.StringUtils;
 /**
  * Editor for {@code java.util.Locale}, to directly populate a Locale property.
  *
- * <p>Expects the same syntax as Locale's {@code toString}, i.e. language +
+ * <p>Expects the same syntax as Locale's {@code toString()}, i.e. language +
  * optionally country + optionally variant, separated by "_" (e.g. "en", "en_US").
- * Also accepts spaces as separators, as alternative to underscores.
+ * Also accepts spaces as separators, as an alternative to underscores.
  *
  * @author Juergen Hoeller
  * @since 26.05.2003

spring-beans/src/main/java/org/springframework/beans/propertyeditors/PathEditor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -26,8 +26,8 @@ import java.nio.file.Paths;
 
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceEditor;
-import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.Assert;
+import org.springframework.util.ResourceUtils;
 
 /**
  * Editor for {@code java.nio.file.Path}, to directly populate a Path
@@ -74,7 +74,7 @@ public class PathEditor extends PropertyEditorSupport {
 
 	@Override
 	public void setAsText(String text) throws IllegalArgumentException {
-		boolean nioPathCandidate = !text.startsWith(ResourceLoader.CLASSPATH_URL_PREFIX);
+		boolean nioPathCandidate = !text.startsWith(ResourceUtils.CLASSPATH_URL_PREFIX);
 		if (nioPathCandidate && !text.startsWith("/")) {
 			try {
 				URI uri = new URI(text);
@@ -85,9 +85,13 @@ public class PathEditor extends PropertyEditorSupport {
 					return;
 				}
 			}
-			catch (URISyntaxException | FileSystemNotFoundException ex) {
-				// Not a valid URI (let's try as Spring resource location),
-				// or a URI scheme not registered for NIO (let's try URL
+			catch (URISyntaxException ex) {
+				// Not a valid URI; potentially a Windows-style path after
+				// a file prefix (let's try as Spring resource location)
+				nioPathCandidate = !text.startsWith(ResourceUtils.FILE_URL_PREFIX);
+			}
+			catch (FileSystemNotFoundException ex) {
+				// URI scheme not registered for NIO (let's try URL
 				// protocol handlers via Spring's resource mechanism).
 			}
 		}
@@ -97,7 +101,7 @@ public class PathEditor extends PropertyEditorSupport {
 		if (resource == null) {
 			setValue(null);
 		}
-		else if (!resource.exists() && nioPathCandidate) {
+		else if (nioPathCandidate && !resource.exists()) {
 			setValue(Paths.get(text).normalize());
 		}
 		else {

spring-beans/src/main/java/org/springframework/beans/support/PropertyComparator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -44,8 +44,6 @@ public class PropertyComparator<T> implements Comparator<T> {
 
 	private final SortDefinition sortDefinition;
 
-	private final BeanWrapperImpl beanWrapper = new BeanWrapperImpl(false);
-
 
 	/**
 	 * Create a new PropertyComparator for the given SortDefinition.
@@ -115,8 +113,9 @@ public class PropertyComparator<T> implements Comparator<T> {
 		// (similar to JSTL EL). If the property doesn't exist in the
 		// first place, let the exception through.
 		try {
-			this.beanWrapper.setWrappedInstance(obj);
-			return this.beanWrapper.getPropertyValue(this.sortDefinition.getProperty());
+			BeanWrapperImpl beanWrapper = new BeanWrapperImpl(false);
+			beanWrapper.setWrappedInstance(obj);
+			return beanWrapper.getPropertyValue(this.sortDefinition.getProperty());
 		}
 		catch (BeansException ex) {
 			logger.debug("PropertyComparator could not access property - treating as null for sorting", ex);

spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -19,12 +19,16 @@ package org.springframework.beans;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 import java.net.URI;
 import java.net.URL;
 import java.time.DayOfWeek;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -45,6 +49,7 @@ import org.springframework.lang.Nullable;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
 /**
  * Unit tests for {@link BeanUtils}.
@@ -81,19 +86,43 @@ class BeanUtilsTests {
 	}
 
 	@Test  // gh-22531
-	void instantiateClassWithOptionalPrimitiveType() throws NoSuchMethodException {
-		Constructor<BeanWithPrimitiveTypes> ctor = BeanWithPrimitiveTypes.class.getDeclaredConstructor(int.class, boolean.class, String.class);
-		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(ctor, null, null, "foo");
-		assertThat(bean.getCounter()).isEqualTo(0);
-		assertThat(bean.isFlag()).isEqualTo(false);
-		assertThat(bean.getValue()).isEqualTo("foo");
+	void instantiateClassWithFewerArgsThanParameters() throws NoSuchMethodException {
+		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
+
+		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
+				BeanUtils.instantiateClass(constructor, null, null, "foo"));
 	}
 
 	@Test  // gh-22531
 	void instantiateClassWithMoreArgsThanParameters() throws NoSuchMethodException {
-		Constructor<BeanWithPrimitiveTypes> ctor = BeanWithPrimitiveTypes.class.getDeclaredConstructor(int.class, boolean.class, String.class);
+		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
+
 		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
-				BeanUtils.instantiateClass(ctor, null, null, "foo", null));
+				BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, null, "foo", null));
+	}
+
+	@Test  // gh-22531, gh-27390
+	void instantiateClassWithOptionalPrimitiveTypes() throws NoSuchMethodException {
+		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
+
+		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, null, "foo");
+
+		assertSoftly(softly -> {
+			softly.assertThat(bean.isFlag()).isFalse();
+			softly.assertThat(bean.getByteCount()).isEqualTo((byte) 0);
+			softly.assertThat(bean.getShortCount()).isEqualTo((short) 0);
+			softly.assertThat(bean.getIntCount()).isEqualTo(0);
+			softly.assertThat(bean.getLongCount()).isEqualTo(0L);
+			softly.assertThat(bean.getFloatCount()).isEqualTo(0F);
+			softly.assertThat(bean.getDoubleCount()).isEqualTo(0D);
+			softly.assertThat(bean.getCharacter()).isEqualTo('\0');
+			softly.assertThat(bean.getText()).isEqualTo("foo");
+		});
+	}
+
+	private Constructor<BeanWithPrimitiveTypes> getBeanWithPrimitiveTypesConstructor() throws NoSuchMethodException {
+		return BeanWithPrimitiveTypes.class.getConstructor(boolean.class, byte.class, short.class, int.class,
+				long.class, float.class, double.class, char.class, String.class);
 	}
 
 	@Test
@@ -196,6 +225,29 @@ class BeanUtilsTests {
 		assertThat(longListHolder.getList()).isEmpty();
 	}
 
+	@Test  // gh-26531
+	void copyPropertiesIgnoresGenericsIfSourceOrTargetHasUnresolvableGenerics() throws Exception {
+		Order original = new Order("test", Arrays.asList("foo", "bar"));
+
+		// Create a Proxy that loses the generic type information for the getLineItems() method.
+		OrderSummary proxy = proxyOrder(original);
+		assertThat(OrderSummary.class.getDeclaredMethod("getLineItems").toGenericString())
+			.contains("java.util.List<java.lang.String>");
+		assertThat(proxy.getClass().getDeclaredMethod("getLineItems").toGenericString())
+			.contains("java.util.List")
+			.doesNotContain("<java.lang.String>");
+
+		// Ensure that our custom Proxy works as expected.
+		assertThat(proxy.getId()).isEqualTo("test");
+		assertThat(proxy.getLineItems()).containsExactly("foo", "bar");
+
+		// Copy from proxy to target.
+		Order target = new Order();
+		BeanUtils.copyProperties(proxy, target);
+		assertThat(target.getId()).isEqualTo("test");
+		assertThat(target.getLineItems()).containsExactly("foo", "bar");
+	}
+
 	@Test
 	void copyPropertiesWithEditable() throws Exception {
 		TestBean tb = new TestBean();
@@ -601,30 +653,68 @@ class BeanUtilsTests {
 
 	private static class BeanWithPrimitiveTypes {
 
-		private int counter;
-
 		private boolean flag;
+		private byte byteCount;
+		private short shortCount;
+		private int intCount;
+		private long longCount;
+		private float floatCount;
+		private double doubleCount;
+		private char character;
+		private String text;
 
-		private String value;
 
 		@SuppressWarnings("unused")
-		public BeanWithPrimitiveTypes(int counter, boolean flag, String value) {
-			this.counter = counter;
-			this.flag = flag;
-			this.value = value;
-		}
+		public BeanWithPrimitiveTypes(boolean flag, byte byteCount, short shortCount, int intCount, long longCount,
+				float floatCount, double doubleCount, char character, String text) {
 
-		public int getCounter() {
-			return counter;
+			this.flag = flag;
+			this.byteCount = byteCount;
+			this.shortCount = shortCount;
+			this.intCount = intCount;
+			this.longCount = longCount;
+			this.floatCount = floatCount;
+			this.doubleCount = doubleCount;
+			this.character = character;
+			this.text = text;
 		}
 
 		public boolean isFlag() {
 			return flag;
 		}
 
-		public String getValue() {
-			return value;
+		public byte getByteCount() {
+			return byteCount;
 		}
+
+		public short getShortCount() {
+			return shortCount;
+		}
+
+		public int getIntCount() {
+			return intCount;
+		}
+
+		public long getLongCount() {
+			return longCount;
+		}
+
+		public float getFloatCount() {
+			return floatCount;
+		}
+
+		public double getDoubleCount() {
+			return doubleCount;
+		}
+
+		public char getCharacter() {
+			return character;
+		}
+
+		public String getText() {
+			return text;
+		}
+
 	}
 
 	private static class PrivateBeanWithPrivateConstructor {
@@ -633,4 +723,77 @@ class BeanUtilsTests {
 		}
 	}
 
+	@SuppressWarnings("unused")
+	private static class Order {
+
+		private String id;
+		private List<String> lineItems;
+
+
+		Order() {
+		}
+
+		Order(String id, List<String> lineItems) {
+			this.id = id;
+			this.lineItems = lineItems;
+		}
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public List<String> getLineItems() {
+			return this.lineItems;
+		}
+
+		public void setLineItems(List<String> lineItems) {
+			this.lineItems = lineItems;
+		}
+
+		@Override
+		public String toString() {
+			return "Order [id=" + this.id + ", lineItems=" + this.lineItems + "]";
+		}
+	}
+
+	private interface OrderSummary {
+
+		String getId();
+
+		List<String> getLineItems();
+	}
+
+
+	private OrderSummary proxyOrder(Order order) {
+		return (OrderSummary) Proxy.newProxyInstance(getClass().getClassLoader(),
+			new Class<?>[] { OrderSummary.class }, new OrderInvocationHandler(order));
+	}
+
+
+	private static class OrderInvocationHandler implements InvocationHandler {
+
+		private final Order order;
+
+
+		OrderInvocationHandler(Order order) {
+			this.order = order;
+		}
+
+		@Override
+		public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+			try {
+				// Ignore args since OrderSummary doesn't declare any methods with arguments,
+				// and we're not supporting equals(Object), etc.
+				return Order.class.getDeclaredMethod(method.getName()).invoke(this.order);
+			}
+			catch (InvocationTargetException ex) {
+				throw ex.getTargetException();
+			}
+		}
+	}
+
 }

spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 /**
  * @author Keith Donald
  * @author Juergen Hoeller
+ * @author Sam Brannen
  */
 public class BeanWrapperAutoGrowingTests {
 
@@ -37,7 +38,7 @@ public class BeanWrapperAutoGrowingTests {
 
 
 	@BeforeEach
-	public void setUp() {
+	public void setup() {
 		wrapper.setAutoGrowNestedPaths(true);
 	}
 
@@ -66,11 +67,6 @@ public class BeanWrapperAutoGrowingTests {
 		assertThat(bean.getArray()[0]).isInstanceOf(Bean.class);
 	}
 
-	private void assertNotNull(Object propertyValue) {
-		assertThat(propertyValue).isNotNull();
-	}
-
-
 	@Test
 	public void setPropertyValueAutoGrowArray() {
 		wrapper.setPropertyValue("array[0].prop", "test");
@@ -93,12 +89,39 @@ public class BeanWrapperAutoGrowingTests {
 	}
 
 	@Test
-	public void getPropertyValueAutoGrowMultiDimensionalArray() {
+	public void getPropertyValueAutoGrow2dArray() {
 		assertNotNull(wrapper.getPropertyValue("multiArray[0][0]"));
 		assertThat(bean.getMultiArray()[0].length).isEqualTo(1);
 		assertThat(bean.getMultiArray()[0][0]).isInstanceOf(Bean.class);
 	}
 
+	@Test
+	public void getPropertyValueAutoGrow3dArray() {
+		assertNotNull(wrapper.getPropertyValue("threeDimensionalArray[1][2][3]"));
+		assertThat(bean.getThreeDimensionalArray()[1].length).isEqualTo(3);
+		assertThat(bean.getThreeDimensionalArray()[1][2][3]).isInstanceOf(Bean.class);
+	}
+
+	@Test
+	public void setPropertyValueAutoGrow2dArray() {
+		Bean newBean = new Bean();
+		newBean.setProp("enigma");
+		wrapper.setPropertyValue("multiArray[2][3]", newBean);
+		assertThat(bean.getMultiArray()[2][3])
+			.isInstanceOf(Bean.class)
+			.extracting(Bean::getProp).isEqualTo("enigma");
+	}
+
+	@Test
+	public void setPropertyValueAutoGrow3dArray() {
+		Bean newBean = new Bean();
+		newBean.setProp("enigma");
+		wrapper.setPropertyValue("threeDimensionalArray[2][3][4]", newBean);
+		assertThat(bean.getThreeDimensionalArray()[2][3][4])
+			.isInstanceOf(Bean.class)
+			.extracting(Bean::getProp).isEqualTo("enigma");
+	}
+
 	@Test
 	public void getPropertyValueAutoGrowList() {
 		assertNotNull(wrapper.getPropertyValue("list[0]"));
@@ -131,7 +154,7 @@ public class BeanWrapperAutoGrowingTests {
 	public void getPropertyValueAutoGrowListFailsAgainstLimit() {
 		wrapper.setAutoGrowCollectionLimit(2);
 		assertThatExceptionOfType(InvalidPropertyException.class).isThrownBy(() ->
-				assertNotNull(wrapper.getPropertyValue("list[4]")))
+				wrapper.getPropertyValue("list[4]"))
 			.withRootCauseInstanceOf(IndexOutOfBoundsException.class);
 	}
 
@@ -161,6 +184,11 @@ public class BeanWrapperAutoGrowingTests {
 	}
 
 
+	private static void assertNotNull(Object propertyValue) {
+		assertThat(propertyValue).isNotNull();
+	}
+
+
 	@SuppressWarnings("rawtypes")
 	public static class Bean {
 
@@ -174,6 +202,8 @@ public class BeanWrapperAutoGrowingTests {
 
 		private Bean[][] multiArray;
 
+		private Bean[][][] threeDimensionalArray;
+
 		private List<Bean> list;
 
 		private List<List<Bean>> multiList;
@@ -214,6 +244,14 @@ public class BeanWrapperAutoGrowingTests {
 			this.multiArray = multiArray;
 		}
 
+		public Bean[][][] getThreeDimensionalArray() {
+			return threeDimensionalArray;
+		}
+
+		public void setThreeDimensionalArray(Bean[][][] threeDimensionalArray) {
+			this.threeDimensionalArray = threeDimensionalArray;
+		}
+
 		public List<Bean> getList() {
 			return list;
 		}

spring-beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -16,7 +16,6 @@
 
 package org.springframework.beans;
 
-import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -46,10 +45,10 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
  * @author Chris Beams
  * @since 18.01.2006
  */
-public class BeanWrapperGenericsTests {
+class BeanWrapperGenericsTests {
 
 	@Test
-	public void testGenericSet() {
+	void testGenericSet() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Set<String> input = new HashSet<>();
@@ -61,7 +60,7 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericLowerBoundedSet() {
+	void testGenericLowerBoundedSet() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, true));
@@ -74,7 +73,7 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericSetWithConversionFailure() {
+	void testGenericSetWithConversionFailure() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Set<TestBean> input = new HashSet<>();
@@ -85,7 +84,7 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericList() throws MalformedURLException {
+	void testGenericList() throws Exception {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		List<String> input = new ArrayList<>();
@@ -97,7 +96,7 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericListElement() throws MalformedURLException {
+	void testGenericListElement() throws Exception {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setResourceList(new ArrayList<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
@@ -106,29 +105,29 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericMap() {
+	void testGenericMap() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Map<String, String> input = new HashMap<>();
 		input.put("4", "5");
 		input.put("6", "7");
 		bw.setPropertyValue("shortMap", input);
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 	}
 
 	@Test
-	public void testGenericMapElement() {
+	void testGenericMapElement() {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setShortMap(new HashMap<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("shortMap[4]", "5");
 		assertThat(bw.getPropertyValue("shortMap[4]")).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
 	}
 
 	@Test
-	public void testGenericMapWithKeyType() {
+	void testGenericMapWithKeyType() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Map<String, String> input = new HashMap<>();
@@ -140,17 +139,17 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericMapElementWithKeyType() {
+	void testGenericMapElementWithKeyType() {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setLongMap(new HashMap<Long, Integer>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("longMap[4]", "5");
-		assertThat(gb.getLongMap().get(new Long("4"))).isEqualTo("5");
+		assertThat(gb.getLongMap().get(Long.valueOf("4"))).isEqualTo("5");
 		assertThat(bw.getPropertyValue("longMap[4]")).isEqualTo("5");
 	}
 
 	@Test
-	public void testGenericMapWithCollectionValue() {
+	void testGenericMapWithCollectionValue() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false));
@@ -162,14 +161,12 @@ public class BeanWrapperGenericsTests {
 		value2.add(Boolean.TRUE);
 		input.put("2", value2);
 		bw.setPropertyValue("collectionMap", input);
-		boolean condition1 = gb.getCollectionMap().get(1) instanceof HashSet;
-		assertThat(condition1).isTrue();
-		boolean condition = gb.getCollectionMap().get(2) instanceof ArrayList;
-		assertThat(condition).isTrue();
+		assertThat(gb.getCollectionMap().get(1) instanceof HashSet).isTrue();
+		assertThat(gb.getCollectionMap().get(2) instanceof ArrayList).isTrue();
 	}
 
 	@Test
-	public void testGenericMapElementWithCollectionValue() {
+	void testGenericMapElementWithCollectionValue() {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setCollectionMap(new HashMap<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
@@ -177,24 +174,23 @@ public class BeanWrapperGenericsTests {
 		HashSet<Integer> value1 = new HashSet<>();
 		value1.add(1);
 		bw.setPropertyValue("collectionMap[1]", value1);
-		boolean condition = gb.getCollectionMap().get(1) instanceof HashSet;
-		assertThat(condition).isTrue();
+		assertThat(gb.getCollectionMap().get(1) instanceof HashSet).isTrue();
 	}
 
 	@Test
-	public void testGenericMapFromProperties() {
+	void testGenericMapFromProperties() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Properties input = new Properties();
 		input.setProperty("4", "5");
 		input.setProperty("6", "7");
 		bw.setPropertyValue("shortMap", input);
-		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
 	}
 
 	@Test
-	public void testGenericListOfLists() throws MalformedURLException {
+	void testGenericListOfLists() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<List<Integer>> list = new ArrayList<>();
 		list.add(new ArrayList<>());
@@ -206,7 +202,7 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericListOfListsWithElementConversion() throws MalformedURLException {
+	void testGenericListOfListsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<List<Integer>> list = new ArrayList<>();
 		list.add(new ArrayList<>());
@@ -218,7 +214,7 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericListOfArrays() throws MalformedURLException {
+	void testGenericListOfArrays() {
 		GenericBean<String> gb = new GenericBean<>();
 		ArrayList<String[]> list = new ArrayList<>();
 		list.add(new String[] {"str1", "str2"});
@@ -230,7 +226,7 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericListOfArraysWithElementConversion() throws MalformedURLException {
+	void testGenericListOfArraysWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		ArrayList<String[]> list = new ArrayList<>();
 		list.add(new String[] {"str1", "str2"});
@@ -243,55 +239,55 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericListOfMaps() throws MalformedURLException {
+	void testGenericListOfMaps() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<Map<Integer, Long>> list = new ArrayList<>();
 		list.add(new HashMap<>());
 		gb.setListOfMaps(list);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
-		bw.setPropertyValue("listOfMaps[0][10]", new Long(5));
-		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(new Long(5));
-		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(new Long(5));
+		bw.setPropertyValue("listOfMaps[0][10]", 5L);
+		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(5L);
+		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(Long.valueOf(5));
 	}
 
 	@Test
-	public void testGenericListOfMapsWithElementConversion() throws MalformedURLException {
+	void testGenericListOfMapsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		List<Map<Integer, Long>> list = new ArrayList<>();
 		list.add(new HashMap<>());
 		gb.setListOfMaps(list);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("listOfMaps[0][10]", "5");
-		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(new Long(5));
-		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(new Long(5));
+		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(5L);
+		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(Long.valueOf(5));
 	}
 
 	@Test
-	public void testGenericMapOfMaps() throws MalformedURLException {
+	void testGenericMapOfMaps() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<String, Map<Integer, Long>> map = new HashMap<>();
 		map.put("mykey", new HashMap<>());
 		gb.setMapOfMaps(map);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
-		bw.setPropertyValue("mapOfMaps[mykey][10]", new Long(5));
-		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(new Long(5));
-		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(new Long(5));
+		bw.setPropertyValue("mapOfMaps[mykey][10]", 5L);
+		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(5L);
+		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(Long.valueOf(5));
 	}
 
 	@Test
-	public void testGenericMapOfMapsWithElementConversion() throws MalformedURLException {
+	void testGenericMapOfMapsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<String, Map<Integer, Long>> map = new HashMap<>();
 		map.put("mykey", new HashMap<>());
 		gb.setMapOfMaps(map);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("mapOfMaps[mykey][10]", "5");
-		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(new Long(5));
-		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(new Long(5));
+		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(Long.valueOf(5));
+		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(Long.valueOf(5));
 	}
 
 	@Test
-	public void testGenericMapOfLists() throws MalformedURLException {
+	void testGenericMapOfLists() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<Integer, List<Integer>> map = new HashMap<>();
 		map.put(1, new ArrayList<>());
@@ -303,7 +299,7 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericMapOfListsWithElementConversion() throws MalformedURLException {
+	void testGenericMapOfListsWithElementConversion() {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<Integer, List<Integer>> map = new HashMap<>();
 		map.put(1, new ArrayList<>());
@@ -315,7 +311,7 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericTypeNestingMapOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfInteger() {
 		Map<String, String> map = new HashMap<>();
 		map.put("testKey", "100");
 
@@ -324,14 +320,13 @@ public class BeanWrapperGenericsTests {
 		bw.setPropertyValue("mapOfInteger", map);
 
 		Object obj = gb.getMapOfInteger().get("testKey");
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 	}
 
 	@Test
-	public void testGenericTypeNestingMapOfListOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfListOfInteger() {
 		Map<String, List<String>> map = new HashMap<>();
-		List<String> list = Arrays.asList(new String[] {"1", "2", "3"});
+		List<String> list = Arrays.asList("1", "2", "3");
 		map.put("testKey", list);
 
 		NestedGenericCollectionBean gb = new NestedGenericCollectionBean();
@@ -339,13 +334,12 @@ public class BeanWrapperGenericsTests {
 		bw.setPropertyValue("mapOfListOfInteger", map);
 
 		Object obj = gb.getMapOfListOfInteger().get("testKey").get(0);
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(1);
 	}
 
 	@Test
-	public void testGenericTypeNestingListOfMapOfInteger() throws Exception {
+	void testGenericTypeNestingListOfMapOfInteger() {
 		List<Map<String, String>> list = new ArrayList<>();
 		Map<String, String> map = new HashMap<>();
 		map.put("testKey", "5");
@@ -356,15 +350,14 @@ public class BeanWrapperGenericsTests {
 		bw.setPropertyValue("listOfMapOfInteger", list);
 
 		Object obj = gb.getListOfMapOfInteger().get(0).get("testKey");
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(5);
 	}
 
 	@Test
-	public void testGenericTypeNestingMapOfListOfListOfInteger() throws Exception {
+	void testGenericTypeNestingMapOfListOfListOfInteger() {
 		Map<String, List<List<String>>> map = new HashMap<>();
-		List<String> list = Arrays.asList(new String[] {"1", "2", "3"});
+		List<String> list = Arrays.asList("1", "2", "3");
 		map.put("testKey", Collections.singletonList(list));
 
 		NestedGenericCollectionBean gb = new NestedGenericCollectionBean();
@@ -372,13 +365,12 @@ public class BeanWrapperGenericsTests {
 		bw.setPropertyValue("mapOfListOfListOfInteger", map);
 
 		Object obj = gb.getMapOfListOfListOfInteger().get("testKey").get(0).get(0);
-		boolean condition = obj instanceof Integer;
-		assertThat(condition).isTrue();
+		assertThat(obj instanceof Integer).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(1);
 	}
 
 	@Test
-	public void testComplexGenericMap() {
+	void testComplexGenericMap() {
 		Map<List<String>, List<String>> inputMap = new HashMap<>();
 		List<String> inputKey = new ArrayList<>();
 		inputKey.add("1");
@@ -391,11 +383,11 @@ public class BeanWrapperGenericsTests {
 		bw.setPropertyValue("genericMap", inputMap);
 
 		assertThat(holder.getGenericMap().keySet().iterator().next().get(0)).isEqualTo(1);
-		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testComplexGenericMapWithCollectionConversion() {
+	void testComplexGenericMapWithCollectionConversion() {
 		Map<Set<String>, Set<String>> inputMap = new HashMap<>();
 		Set<String> inputKey = new HashSet<>();
 		inputKey.add("1");
@@ -408,11 +400,11 @@ public class BeanWrapperGenericsTests {
 		bw.setPropertyValue("genericMap", inputMap);
 
 		assertThat(holder.getGenericMap().keySet().iterator().next().get(0)).isEqualTo(1);
-		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testComplexGenericIndexedMapEntry() {
+	void testComplexGenericIndexedMapEntry() {
 		List<String> inputValue = new ArrayList<>();
 		inputValue.add("10");
 
@@ -421,11 +413,11 @@ public class BeanWrapperGenericsTests {
 		bw.setPropertyValue("genericIndexedMap[1]", inputValue);
 
 		assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testComplexGenericIndexedMapEntryWithCollectionConversion() {
+	void testComplexGenericIndexedMapEntryWithCollectionConversion() {
 		Set<String> inputValue = new HashSet<>();
 		inputValue.add("10");
 
@@ -434,11 +426,11 @@ public class BeanWrapperGenericsTests {
 		bw.setPropertyValue("genericIndexedMap[1]", inputValue);
 
 		assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testComplexDerivedIndexedMapEntry() {
+	void testComplexDerivedIndexedMapEntry() {
 		List<String> inputValue = new ArrayList<>();
 		inputValue.add("10");
 
@@ -447,11 +439,11 @@ public class BeanWrapperGenericsTests {
 		bw.setPropertyValue("derivedIndexedMap[1]", inputValue);
 
 		assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testComplexDerivedIndexedMapEntryWithCollectionConversion() {
+	void testComplexDerivedIndexedMapEntryWithCollectionConversion() {
 		Set<String> inputValue = new HashSet<>();
 		inputValue.add("10");
 
@@ -460,11 +452,11 @@ public class BeanWrapperGenericsTests {
 		bw.setPropertyValue("derivedIndexedMap[1]", inputValue);
 
 		assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
+		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testGenericallyTypedIntegerBean() throws Exception {
+	void testGenericallyTypedIntegerBean() {
 		GenericIntegerBean gb = new GenericIntegerBean();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("genericProperty", "10");
@@ -475,7 +467,7 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testGenericallyTypedSetOfIntegerBean() throws Exception {
+	void testGenericallyTypedSetOfIntegerBean() {
 		GenericSetOfIntegerBean gb = new GenericSetOfIntegerBean();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("genericProperty", "10");
@@ -486,23 +478,23 @@ public class BeanWrapperGenericsTests {
 	}
 
 	@Test
-	public void testSettingGenericPropertyWithReadOnlyInterface() {
+	void testSettingGenericPropertyWithReadOnlyInterface() {
 		Bar bar = new Bar();
 		BeanWrapper bw = new BeanWrapperImpl(bar);
 		bw.setPropertyValue("version", "10");
-		assertThat(bar.getVersion()).isEqualTo(new Double(10.0));
+		assertThat(bar.getVersion()).isEqualTo(Double.valueOf(10.0));
 	}
 
 	@Test
-	public void testSettingLongPropertyWithGenericInterface() {
+	void testSettingLongPropertyWithGenericInterface() {
 		Promotion bean = new Promotion();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.setPropertyValue("id", "10");
-		assertThat(bean.getId()).isEqualTo(new Long(10));
+		assertThat(bean.getId()).isEqualTo(Long.valueOf(10));
 	}
 
 	@Test
-	public void testUntypedPropertyWithMapAtRuntime() {
+	void testUntypedPropertyWithMapAtRuntime() {
 		class Holder<D> {
 			private final D data;
 			public Holder(D data) {

spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -26,6 +26,7 @@ import org.springframework.beans.testfixture.beans.TestBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 
 /**
  * Specific {@link BeanWrapperImpl} tests.
@@ -37,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
  * @author Chris Beams
  * @author Dave Syer
  */
-public class BeanWrapperTests extends AbstractPropertyAccessorTests {
+class BeanWrapperTests extends AbstractPropertyAccessorTests {
 
 	@Override
 	protected BeanWrapperImpl createAccessor(Object target) {
@@ -46,7 +47,7 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 
 
 	@Test
-	public void setterDoesNotCallGetter() {
+	void setterDoesNotCallGetter() {
 		GetterBean target = new GetterBean();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setPropertyValue("name", "tom");
@@ -55,7 +56,7 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}
 
 	@Test
-	public void getterSilentlyFailWithOldValueExtraction() {
+	void getterSilentlyFailWithOldValueExtraction() {
 		GetterBean target = new GetterBean();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setExtractOldValueForEditor(true); // This will call the getter
@@ -65,7 +66,7 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}
 
 	@Test
-	public void aliasedSetterThroughDefaultMethod() {
+	void aliasedSetterThroughDefaultMethod() {
 		GetterBean target = new GetterBean();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setPropertyValue("aliasedName", "tom");
@@ -74,7 +75,7 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}
 
 	@Test
-	public void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() {
+	void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() {
 		TestBean target = new TestBean();
 		String newName = "tony";
 		String invalidTouchy = ".valid";
@@ -91,12 +92,12 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 						.getNewValue()).isEqualTo(invalidTouchy);
 			});
 		// Test validly set property matches
-		assertThat(target.getName().equals(newName)).as("Valid set property must stick").isTrue();
-		assertThat(target.getAge() == 0).as("Invalid set property must retain old value").isTrue();
+		assertThat(target.getName()).as("Valid set property must stick").isEqualTo(newName);
+		assertThat(target.getAge()).as("Invalid set property must retain old value").isEqualTo(0);
 	}
 
 	@Test
-	public void checkNotWritablePropertyHoldPossibleMatches() {
+	void checkNotWritablePropertyHoldPossibleMatches() {
 		TestBean target = new TestBean();
 		BeanWrapper accessor = createAccessor(target);
 		assertThatExceptionOfType(NotWritablePropertyException.class).isThrownBy(() ->
@@ -105,15 +106,15 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}
 
 	@Test // Can't be shared; there is no such thing as a read-only field
-	public void setReadOnlyMapProperty() {
+	void setReadOnlyMapProperty() {
 		TypedReadOnlyMap map = new TypedReadOnlyMap(Collections.singletonMap("key", new TestBean()));
 		TypedReadOnlyMapClient target = new TypedReadOnlyMapClient();
 		BeanWrapper accessor = createAccessor(target);
-		accessor.setPropertyValue("map", map);
+		assertThatNoException().isThrownBy(() -> accessor.setPropertyValue("map", map));
 	}
 
 	@Test
-	public void notWritablePropertyExceptionContainsAlternativeMatch() {
+	void notWritablePropertyExceptionContainsAlternativeMatch() {
 		IntelliBean target = new IntelliBean();
 		BeanWrapper bw = createAccessor(target);
 		try {
@@ -121,12 +122,12 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 		}
 		catch (NotWritablePropertyException ex) {
 			assertThat(ex.getPossibleMatches()).as("Possible matches not determined").isNotNull();
-			assertThat(ex.getPossibleMatches().length).as("Invalid amount of alternatives").isEqualTo(1);
+			assertThat(ex.getPossibleMatches()).as("Invalid amount of alternatives").hasSize(1);
 		}
 	}
 
 	@Test
-	public void notWritablePropertyExceptionContainsAlternativeMatches() {
+	void notWritablePropertyExceptionContainsAlternativeMatches() {
 		IntelliBean target = new IntelliBean();
 		BeanWrapper bw = createAccessor(target);
 		try {
@@ -134,23 +135,23 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 		}
 		catch (NotWritablePropertyException ex) {
 			assertThat(ex.getPossibleMatches()).as("Possible matches not determined").isNotNull();
-			assertThat(ex.getPossibleMatches().length).as("Invalid amount of alternatives").isEqualTo(3);
+			assertThat(ex.getPossibleMatches()).as("Invalid amount of alternatives").hasSize(3);
 		}
 	}
 
 	@Override
 	@Test  // Can't be shared: no type mismatch with a field
-	public void setPropertyTypeMismatch() {
+	void setPropertyTypeMismatch() {
 		PropertyTypeMismatch target = new PropertyTypeMismatch();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setPropertyValue("object", "a String");
 		assertThat(target.value).isEqualTo("a String");
-		assertThat(target.getObject() == 8).isTrue();
+		assertThat(target.getObject()).isEqualTo(8);
 		assertThat(accessor.getPropertyValue("object")).isEqualTo(8);
 	}
 
 	@Test
-	public void propertyDescriptors() {
+	void propertyDescriptors() {
 		TestBean target = new TestBean();
 		target.setSpouse(new TestBean());
 		BeanWrapper accessor = createAccessor(target);
@@ -166,7 +167,7 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 
 	@Test
 	@SuppressWarnings("unchecked")
-	public void getPropertyWithOptional() {
+	void getPropertyWithOptional() {
 		GetterWithOptional target = new GetterWithOptional();
 		TestBean tb = new TestBean("x");
 		BeanWrapper accessor = createAccessor(target);
@@ -189,7 +190,7 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}
 
 	@Test
-	public void getPropertyWithOptionalAndAutoGrow() {
+	void getPropertyWithOptionalAndAutoGrow() {
 		GetterWithOptional target = new GetterWithOptional();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setAutoGrowNestedPaths(true);
@@ -201,7 +202,7 @@ public class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}
 
 	@Test
-	public void incompletelyQuotedKeyLeadsToPropertyException() {
+	void incompletelyQuotedKeyLeadsToPropertyException() {
 		TestBean target = new TestBean();
 		BeanWrapper accessor = createAccessor(target);
 		assertThatExceptionOfType(NotWritablePropertyException.class).isThrownBy(() ->

spring-beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -18,14 +18,14 @@ package org.springframework.beans;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,23 +36,21 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Chris Beams
  * @since 08.03.2004
  */
-public class ConcurrentBeanWrapperTests {
+class ConcurrentBeanWrapperTests {
 
 	private final Log logger = LogFactory.getLog(getClass());
 
-	private Set<TestRun> set = Collections.synchronizedSet(new HashSet<TestRun>());
+	private final Set<TestRun> set = ConcurrentHashMap.newKeySet();
 
 	private Throwable ex = null;
 
-	@Test
-	public void testSingleThread() {
-		for (int i = 0; i < 100; i++) {
-			performSet();
-		}
+	@RepeatedTest(100)
+	void testSingleThread() {
+		performSet();
 	}
 
 	@Test
-	public void testConcurrent() {
+	void testConcurrent() {
 		for (int i = 0; i < 10; i++) {
 			TestRun run = new TestRun(this);
 			set.add(run);
@@ -82,7 +80,7 @@ public class ConcurrentBeanWrapperTests {
 
 		Properties p = (Properties) System.getProperties().clone();
 
-		assertThat(p.size() != 0).as("The System properties must not be empty").isTrue();
+		assertThat(p).as("The System properties must not be empty").isNotEmpty();
 
 		for (Iterator<?> i = p.entrySet().iterator(); i.hasNext();) {
 			i.next();
@@ -111,7 +109,7 @@ public class ConcurrentBeanWrapperTests {
 
 		private ConcurrentBeanWrapperTests test;
 
-		public TestRun(ConcurrentBeanWrapperTests test) {
+		TestRun(ConcurrentBeanWrapperTests test) {
 			this.test = test;
 		}
 

spring-beans/src/test/java/org/springframework/beans/DirectFieldAccessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 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.
@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Chris Beams
  * @author Stephane Nicoll
  */
-public class DirectFieldAccessorTests extends AbstractPropertyAccessorTests {
+class DirectFieldAccessorTests extends AbstractPropertyAccessorTests {
 
 	@Override
 	protected DirectFieldAccessor createAccessor(Object target) {
@@ -38,7 +38,7 @@ public class DirectFieldAccessorTests extends AbstractPropertyAccessorTests {
 
 
 	@Test
-	public void withShadowedField() {
+	void withShadowedField() {
 		final StringBuilder sb = new StringBuilder();
 
 		TestBean target = new TestBean() {

spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 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.
@@ -182,9 +182,9 @@ class DefaultListableBeanFactoryTests {
 
 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 		beanNames = lbf.getBeanNamesForAnnotation(SuppressWarnings.class);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -216,9 +216,9 @@ class DefaultListableBeanFactoryTests {
 
 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 		beanNames = lbf.getBeanNamesForAnnotation(SuppressWarnings.class);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -249,9 +249,9 @@ class DefaultListableBeanFactoryTests {
 
 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 		beanNames = lbf.getBeanNamesForAnnotation(SuppressWarnings.class);
-		assertThat(beanNames.length).isEqualTo(0);
+		assertThat(beanNames).hasSize(0);
 
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -283,7 +283,7 @@ class DefaultListableBeanFactoryTests {
 
 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(1);
+		assertThat(beanNames).hasSize(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isTrue();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -337,7 +337,7 @@ class DefaultListableBeanFactoryTests {
 
 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(1);
+		assertThat(beanNames).hasSize(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -349,7 +349,7 @@ class DefaultListableBeanFactoryTests {
 		assertThat(lbf.isTypeMatch("x1", TestBean.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x1", TestBean.class)).isFalse();
 		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isEqualTo(null);
+		assertThat(lbf.getType("&x1")).isNull();
 		assertThat(TestBeanFactory.initialized).isFalse();
 	}
 
@@ -362,7 +362,7 @@ class DefaultListableBeanFactoryTests {
 
 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(1);
+		assertThat(beanNames).hasSize(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -374,7 +374,7 @@ class DefaultListableBeanFactoryTests {
 		assertThat(lbf.isTypeMatch("x1", TestBean.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x1", TestBean.class)).isFalse();
 		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isEqualTo(null);
+		assertThat(lbf.getType("&x1")).isNull();
 		assertThat(TestBeanFactory.initialized).isFalse();
 	}
 
@@ -389,7 +389,7 @@ class DefaultListableBeanFactoryTests {
 
 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(1);
+		assertThat(beanNames).hasSize(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -401,7 +401,7 @@ class DefaultListableBeanFactoryTests {
 		assertThat(lbf.isTypeMatch("x1", TestBean.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x1", TestBean.class)).isFalse();
 		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isEqualTo(null);
+		assertThat(lbf.getType("&x1")).isNull();
 		assertThat(TestBeanFactory.initialized).isFalse();
 	}
 
@@ -417,7 +417,7 @@ class DefaultListableBeanFactoryTests {
 
 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames.length).isEqualTo(1);
+		assertThat(beanNames).hasSize(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -450,7 +450,7 @@ class DefaultListableBeanFactoryTests {
 		assertThat(lbf.isTypeMatch("x2", Object.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x2", Object.class)).isFalse();
 		assertThat(lbf.getType("x2")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x2")).isEqualTo(null);
+		assertThat(lbf.getType("&x2")).isNull();
 		assertThat(lbf.getAliases("x1").length).isEqualTo(1);
 		assertThat(lbf.getAliases("x1")[0]).isEqualTo("x2");
 		assertThat(lbf.getAliases("&x1").length).isEqualTo(1);
@@ -3030,7 +3030,7 @@ class DefaultListableBeanFactoryTests {
 		public Object convertIfNecessary(Object value, @Nullable Class requiredType) {
 			if (value instanceof String && Float.class.isAssignableFrom(requiredType)) {
 				try {
-					return new Float(this.numberFormat.parse((String) value).floatValue());
+					return this.numberFormat.parse((String) value).floatValue();
 				}
 				catch (ParseException ex) {
 					throw new TypeMismatchException(value, requiredType, ex);