Release v5.3.10

SECURITY.md

@@ -8,4 +8,4 @@ wiki page.
 
 ## Reporting a Vulnerability
 
-Please see https://spring.io/security-policy.
+Please see https://pivotal.io/security.

build.gradle

@@ -1,17 +1,17 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.10'
-	id "io.freefair.aspectj" version '6.2.0' apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.5.30' apply false
 	id 'org.jetbrains.dokka' version '1.5.0' apply false
-	id 'org.jetbrains.kotlin.jvm' version '1.5.31' apply false
-	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.31" apply false
 	id 'org.asciidoctor.jvm.convert' version '3.3.2'
 	id 'org.asciidoctor.jvm.pdf' version '3.3.2'
-	id "org.unbroken-dome.xjc" version '2.0.0' apply false
+	id '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 'de.undercouch.download' version '4.1.2'
 	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 {
@@ -28,15 +28,15 @@ configure(allprojects) { project ->
 	dependencyManagement {
 		imports {
 			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.5"
-			mavenBom "io.netty:netty-bom:4.1.70.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.13"
+			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.44.v20210927"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.31"
+			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.1"
+			mavenBom "org.junit:junit-bom:5.8.0"
 		}
 		dependencies {
 			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.1') {
@@ -45,7 +45,7 @@ configure(allprojects) { project ->
 				entry 'log4j-jul'
 				entry 'log4j-slf4j-impl'
 			}
-			dependency "org.slf4j:slf4j-api:1.7.32"
+			dependency "org.slf4j:slf4j-api:1.7.30"
 			dependency("com.google.code.findbugs:findbugs:3.0.1") {
 				exclude group: "dom4j", name: "dom4j"
 			}
@@ -56,7 +56,7 @@ configure(allprojects) { project ->
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
 			}
-			dependencySet(group: 'org.codehaus.groovy', version: '3.0.9') {
+			dependencySet(group: 'org.codehaus.groovy', version: '3.0.8') {
 				entry 'groovy'
 				entry 'groovy-jsr223'
 				entry 'groovy-templates'  // requires findbugs for warning-free compilation
@@ -68,8 +68,8 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
 			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
-			dependency "io.smallrye.reactive:mutiny:1.1.1"
-			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
+			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.3.0"
@@ -77,13 +77,13 @@ configure(allprojects) { project ->
 				exclude group: "stax", name: "stax-api"
 			}
 			dependency "com.google.code.gson:gson:2.8.8"
-			dependency "com.google.protobuf:protobuf-java-util:3.18.0"
+			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.18") {
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.apache.johnzon:johnzon-jsonb:1.2.14"
+			dependency "org.apache.johnzon:johnzon-jsonb:1.2.10"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
@@ -95,11 +95,11 @@ configure(allprojects) { project ->
 			dependency "org.yaml:snakeyaml:1.29"
 
 			dependency "com.h2database:h2:1.4.200"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.9.2"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.9.1"
 			dependency "com.github.librepdf:openpdf:1.3.26"
-			dependency "com.rometools:rome:1.16.0"
+			dependency "com.rometools:rome:1.15.0"
 			dependency "commons-io:commons-io:2.5"
-			dependency "io.vavr:vavr:0.10.4"
+			dependency "io.vavr:vavr:0.10.3"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
 			dependencySet(group: 'org.apache.activemq', version: '5.16.2') {
 				entry 'activemq-broker'
@@ -125,28 +125,28 @@ configure(allprojects) { project ->
 			dependency "org.ehcache:ehcache:3.4.0"
 			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.48"
+			dependency "org.webjars:webjars-locator-core:0.47"
 			dependency "org.webjars:underscorejs:1.8.3"
 
-			dependencySet(group: 'org.apache.tomcat', version: '9.0.54') {
+			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.54') {
+			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.12.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"
 				}
 				entry('undertow-servlet') {
-					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_4.0_spec"
-					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.3_spec"
+					exclude group: "org.jboss.spec.javax.servlet", name: "jboss-servlet-api_3.1_spec"
+					exclude group: "org.jboss.spec.javax.annotation", name: "jboss-annotations-api_1.2_spec"
 				}
 			}
 
@@ -188,17 +188,16 @@ configure(allprojects) { project ->
 				exclude group: "junit", name: "junit"
 			}
 			dependency "org.testng:testng:7.4.0"
-			dependency "org.junit.support:testng-engine:1.0.1"
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
-			dependency "org.assertj:assertj-core:3.21.0"
-			dependencySet(group: 'org.xmlunit', version: '2.8.3') {
+			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: '4.0.0') {
+			dependencySet(group: 'org.mockito', version: '3.12.4') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
@@ -206,10 +205,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.12.0"
 
-			dependency("net.sourceforge.htmlunit:htmlunit:2.54.0") {
+			dependency("net.sourceforge.htmlunit:htmlunit:2.52.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.54.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") {
@@ -340,7 +339,7 @@ configure([rootProject] + javaProjects) { project ->
 	}
 
 	checkstyle {
-		toolVersion = "9.0"
+		toolVersion = "8.45.1"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}
 
@@ -362,7 +361,7 @@ configure([rootProject] + javaProjects) { project ->
 		// JSR-305 only used for non-required meta-annotations
 		compileOnly("com.google.code.findbugs:jsr305")
 		testCompileOnly("com.google.code.findbugs:jsr305")
-		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.29")
+		checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.15")
 	}
 
 	ext.javadocLinks = [
@@ -370,6 +369,7 @@ configure([rootProject] + javaProjects) { project ->
 			"https://docs.oracle.com/javaee/7/api/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
 			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
+			"https://glassfish.java.net/nonav/docs/v3/api/",
 			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
 			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
 			"https://tiles.apache.org/tiles-request/apidocs/",
@@ -383,9 +383,7 @@ configure([rootProject] + javaProjects) { project ->
 			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			// Disabling linking to JUnit 5.8.1, since the `package-list` file no longer exists due to
-			// https://github.com/junit-team/junit5/commit/67ad4e545518b0ce2b0e7c96df31a669866d5003.
-			// "https://junit.org/junit5/docs/5.8.1/api/",
+			"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/"

buildSrc/build.gradle

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

ci/parameters.yml

@@ -5,7 +5,7 @@ github-repo: "https://github.com/spring-projects/spring-framework.git"
 github-repo-name: "spring-projects/spring-framework"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
-branch: "5.3.x"
+branch: "main"
 milestone: "5.3.x"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"

ci/pipeline.yml

@@ -46,11 +46,6 @@ resource_types:
   source:
     repository: springio/artifactory-resource
     tag: 0.0.17
-- name: github-release
-  type: registry-image
-  source:
-    repository: concourse/github-release-resource
-    tag: 1.5.5
 - name: github-status-resource
   type: registry-image
   source:

ci/tasks/generate-changelog.yml

@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: springio/github-changelog-generator
-    tag: '0.0.7'
+    tag: '0.0.6'
 inputs:
 - name: git-repo
 - name: artifactory-repo

gradle.properties

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

gradle/docs-dokka.gradle

@@ -1,7 +1,7 @@
 tasks.findByName("dokkaHtmlPartial")?.configure {
-	outputDirectory.set(new File(buildDir, "docs/kdoc"))
-	dokkaSourceSets {
-		configureEach {
+    outputDirectory.set(new File(buildDir, "docs/kdoc"))
+    dokkaSourceSets {
+        configureEach {
 			sourceRoots.setFrom(file("src/main/kotlin"))
 			classpath.from(sourceSets["main"].runtimeClasspath)
 			externalDocumentationLink {
@@ -17,7 +17,7 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 				url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
 			}
 			externalDocumentationLink {
-				url.set(new URL("https://javadoc.io/doc/org.hamcrest/hamcrest/2.1/"))
+				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/"))
@@ -26,5 +26,5 @@ tasks.findByName("dokkaHtmlPartial")?.configure {
 				url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
 			}
 		}
-	}
+    }
 }

gradle/docs.gradle

@@ -46,9 +46,8 @@ task api(type: Javadoc) {
 		stylesheetFile = file("src/docs/api/stylesheet.css")
 		splitIndex = true
 		links(project.ext.javadocLinks)
-		addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint
-		addBooleanOption('Xwerror', true) // fail build on Javadoc warnings
-		if (JavaVersion.current().isJava9Compatible()) {
+		addStringOption('Xdoclint:none', '-quiet')
+		if(JavaVersion.current().isJava9Compatible()) {
 			addBooleanOption('html5', true)
 		}
 	}

gradle/ide.gradle

@@ -69,20 +69,42 @@ eclipse.classpath.file.whenMerged {
 	}
 }
 
+// Allow projects to be used as WTP modules
+eclipse.project.natures 'org.eclipse.wst.common.project.facet.core.nature'
+
 // Include project specific settings
 task eclipseSettings(type: Copy) {
 	from rootProject.files(
-		'src/eclipse/org.eclipse.jdt.core.prefs',
-		'src/eclipse/org.eclipse.jdt.ui.prefs')
+		'src/eclipse/org.eclipse.jdt.ui.prefs',
+		'src/eclipse/org.eclipse.wst.common.project.facet.core.xml')
 	into project.file('.settings/')
 	outputs.upToDateWhen { false }
 }
 
+task 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 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')
 }
 
-tasks['eclipse'].dependsOn(eclipseSettings)
-tasks['eclipseJdt'].dependsOn(eclipseSettings)
+tasks['eclipse'].dependsOn(eclipseSettings, eclipseJdtSettings, eclipseWstComponentSettings)
+tasks['eclipseJdt'].dependsOn(eclipseJdtSettings)
 tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)

import-into-eclipse.md

@@ -3,11 +3,11 @@
 This document will guide you through the process of importing the Spring Framework
 projects into Eclipse or the Spring Tool Suite (_STS_). It is recommended that you
 have a recent version of Eclipse. As a bare minimum you will need Eclipse with full Java
-8 support, Eclipse Buildship, and the Groovy plugin.
+8 support, Eclipse Buildship, the Kotlin plugin, and the Groovy plugin.
 
-The following instructions have been tested against [STS](https://spring.io/tools) 4.12.0
-([download](https://github.com/spring-projects/sts4/wiki/Previous-Versions#spring-tools-4120-changelog))
-(based on Eclipse 4.21) with [Eclipse Buildship](https://projects.eclipse.org/projects/tools.buildship).
+The following instructions have been tested against [STS](https://spring.io/tools) 4.3.2
+([download](https://github.com/spring-projects/sts4/wiki/Previous-Versions#spring-tools-432-changelog))
+(based on Eclipse 4.12) with [Eclipse Buildship](https://projects.eclipse.org/projects/tools.buildship).
 The instructions should work with the latest Eclipse distribution as long as you install
 [Buildship](https://marketplace.eclipse.org/content/buildship-gradle-integration). Note
 that STS 4 comes with Buildship preinstalled.
@@ -16,32 +16,28 @@ that STS 4 comes with Buildship preinstalled.
 
 _When instructed to execute `./gradlew` from the command line, be sure to execute it within your locally cloned `spring-framework` working directory._
 
-1. Install the [Groovy Development Tools](https://marketplace.eclipse.org/content/groovy-development-tools).
-1. Switch to Groovy 3.0 in Eclipse (Preferences → Groovy → Compiler → Switch to 3.0...).
-   - If you encounter build errors stating something similar to _"Groovy: compiler mismatch: project level is 2.5, workspace level is 3.0"_, change the Groovy compiler version to 3.0 for each affected project.
-1. Ensure that the _Forbidden reference (access rule)_ in Eclipse is set to `Info`
-(Preferences → Java → Compiler → Errors/Warnings → Deprecated and restricted API → Forbidden reference (access rule)).
-1. Optionally install the [Kotlin Plugin for Eclipse](https://marketplace.eclipse.org/content/kotlin-plugin-eclipse) if you need to execute Kotlin-based tests or develop Kotlin extensions.
-   - **NOTE**: As of September 21, 2021, it appears that the Kotlin Plugin for Eclipse does not yet work with Eclipse 4.21.
-1. Optionally install the [AspectJ Development Tools](https://marketplace.eclipse.org/content/aspectj-development-tools) (_AJDT_) if you need to work with the `spring-aspects` project.
-   - **NOTE**: As of September 21, 2021, it appears that the AspectJ Development Tools do not yet work with Eclipse 4.21.
-1. Optionally install the [TestNG plugin](https://testng.org/doc/eclipse.html) in Eclipse if you need to execute individual TestNG test classes or tests in the `spring-test` module.
-   - As an alternative to installing the TestNG plugin, you can execute the `org.springframework.test.context.testng.TestNGTestSuite` class as a "JUnit 5" test class in Eclipse.
+1. Ensure that Eclipse launches with JDK 8.
+   - For example, on Mac OS this can be configured in the `Info.plist` file located in the `Contents` folder of the installed Eclipse or STS application (e.g., the `Eclipse.app` file).
+1. Install the [Kotlin Plugin for Eclipse](https://marketplace.eclipse.org/content/kotlin-plugin-eclipse) in Eclipse.
+1. Install the [Eclipse Groovy Development Tools](https://github.com/groovy/groovy-eclipse/wiki) in Eclipse.
+1. Switch to Groovy 2.5 (Preferences -> Groovy -> Compiler -> Switch to 2.5...) in Eclipse.
+1. Change the _Forbidden reference (access rule)_ in Eclipse from Error to Warning
+(Preferences -> Java -> Compiler -> Errors/Warnings -> Deprecated and restricted API -> Forbidden reference (access rule)).
+1. Optionally install the [AspectJ Development Tools](https://marketplace.eclipse.org/content/aspectj-development-tools) (_AJDT_) if you need to work with the `spring-aspects` project. The AspectJ Development Tools available in the Eclipse Marketplace have been tested with these instructions using STS 4.5 (Eclipse 4.14).
+1. Optionally install the [TestNG plugin](https://testng.org/doc/eclipse.html) in Eclipse if you need to execute TestNG tests in the `spring-test` module.
 1. Build `spring-oxm` from the command line with `./gradlew :spring-oxm:check`.
-1. To apply Spring Framework specific settings, run `./gradlew cleanEclipse eclipse` from the command line.
-1. Import all projects into Eclipse (File → Import → Gradle → Existing Gradle Project → Navigate to the locally cloned `spring-framework` directory → Select Finish).
+1. To apply project specific settings, run `./gradlew eclipseBuildship` from the command line.
+1. Import into Eclipse (File -> Import -> Gradle -> Existing Gradle Project -> Navigate to the locally cloned `spring-framework` directory -> Select Finish).
    - If you have not installed AJDT, exclude the `spring-aspects` project from the import, if prompted, or close it after the import.
-   - If you run into errors during the import, you may need to set the _Java home_ for Gradle Buildship to the location of your JDK 8 installation in Eclipse (Preferences → Gradle → Java home).
-1. If you need to execute JAXB-related tests in the `spring-oxm` project and wish to have the generated sources available, add the `build/generated-sources/jaxb` folder to the build path (right click on the `jaxb` folder and select "Build Path → Use as Source Folder").
-   - If you do not see the `build` folder in the `spring-oxm` project, ensure that the "Gradle build folder" is not filtered out from the view. This setting is available under "Filters" in the configuration of the Package Explorer (available by clicking on the _three vertical dots_ in the upper right corner of the Package Explorer).
+   - If you run into errors during the import, you may need to set the _Java home_ for Gradle Buildship to the location of your JDK 8 installation in Eclipse (Preferences -> Gradle -> Java home).
+1. If you need to execute JAXB-related tests in the `spring-oxm` project and wish to have the generated sources available, add the `build/generated-sources/jaxb` folder to the build path (right click on the `jaxb` folder and select `Build Path -> Use as Source Folder`).
+   - If you do not see the `build` folder in the `spring-oxm` project, ensure that the "Gradle build folder" is not filtered out from the view. This setting is available under "Filters" in the configuration of the Package Explorer (available by clicking on the small downward facing arrow in the upper right corner of the Package Explorer).
 1. Code away!
 
 ## Known Issues
 
-1. `spring-core` should be pre-compiled due to repackaged dependencies.
-   - See `*RepackJar` tasks in the `spring-core.gradle` build file.
-1. `spring-oxm` should be pre-compiled due to JAXB types generated for tests.
-   - Note that executing `./gradlew :spring-oxm:check` as explained in the _Steps_ above will compile `spring-core` and generate JAXB types for `spring-oxm`.
+1. `spring-core` and `spring-oxm` should be pre-compiled due to repackaged dependencies.
+   - See `*RepackJar` tasks in the build.
 1. `spring-aspects` does not compile due to references to aspect types unknown to Eclipse.
    - If you installed _AJDT_ into Eclipse it should work.
 1. While JUnit tests pass from the command line with Gradle, some may fail when run from

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -237,7 +237,7 @@ class CglibAopProxy implements AopProxy, Serializable {
 	 * validates it if not.
 	 */
 	private void validateClassIfNecessary(Class<?> proxySuperClass, @Nullable ClassLoader proxyClassLoader) {
-		if (!this.advised.isOptimize() && logger.isInfoEnabled()) {
+		if (logger.isWarnEnabled()) {
 			synchronized (validatedClasses) {
 				if (!validatedClasses.containsKey(proxySuperClass)) {
 					doValidateClass(proxySuperClass, proxyClassLoader,
@@ -679,19 +679,13 @@ class CglibAopProxy implements AopProxy, Serializable {
 				Object retVal;
 				// Check whether we only have one InvokerInterceptor: that is,
 				// no real advice, but just reflective invocation of the target.
-				if (chain.isEmpty() && CglibMethodInvocation.isMethodProxyCompatible(method)) {
+				if (chain.isEmpty() && Modifier.isPublic(method.getModifiers())) {
 					// We can skip creating a MethodInvocation: just invoke the target directly.
 					// Note that the final invoker must be an InvokerInterceptor, so we know
 					// it does nothing but a reflective operation on the target, and no hot
 					// swapping or fancy proxying.
 					Object[] argsToUse = AopProxyUtils.adaptArgumentsIfNecessary(method, args);
-					try {
-						retVal = methodProxy.invoke(target, argsToUse);
-					}
-					catch (CodeGenerationException ex) {
-						CglibMethodInvocation.logFastClassGenerationFailure(method);
-						retVal = AopUtils.invokeJoinpointUsingReflection(target, method, argsToUse);
-					}
+					retVal = methodProxy.invoke(target, argsToUse);
 				}
 				else {
 					// We need to create a method invocation...
@@ -743,7 +737,10 @@ class CglibAopProxy implements AopProxy, Serializable {
 			super(proxy, target, method, arguments, targetClass, interceptorsAndDynamicMethodMatchers);
 
 			// Only use method proxy for public methods not derived from java.lang.Object
-			this.methodProxy = (isMethodProxyCompatible(method) ? methodProxy : null);
+			this.methodProxy = (Modifier.isPublic(method.getModifiers()) &&
+					method.getDeclaringClass() != Object.class && !AopUtils.isEqualsMethod(method) &&
+					!AopUtils.isHashCodeMethod(method) && !AopUtils.isToStringMethod(method) ?
+					methodProxy : null);
 		}
 
 		@Override
@@ -779,25 +776,10 @@ class CglibAopProxy implements AopProxy, Serializable {
 		@Override
 		protected Object invokeJoinpoint() throws Throwable {
 			if (this.methodProxy != null) {
-				try {
-					return this.methodProxy.invoke(this.target, this.arguments);
-				}
-				catch (CodeGenerationException ex) {
-					logFastClassGenerationFailure(this.method);
-				}
+				return this.methodProxy.invoke(this.target, this.arguments);
 			}
-			return super.invokeJoinpoint();
-		}
-
-		static boolean isMethodProxyCompatible(Method method) {
-			return (Modifier.isPublic(method.getModifiers()) &&
-					method.getDeclaringClass() != Object.class && !AopUtils.isEqualsMethod(method) &&
-					!AopUtils.isHashCodeMethod(method) && !AopUtils.isToStringMethod(method));
-		}
-
-		static void logFastClassGenerationFailure(Method method) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Failed to generate CGLIB fast class for method: " + method);
+			else {
+				return super.invokeJoinpoint();
 			}
 		}
 	}

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

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

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

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

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

@@ -25,11 +25,9 @@ import org.springframework.lang.Nullable;
 /**
  * Convenient TargetSourceCreator using bean name prefixes to create one of three
  * well-known TargetSource types:
- * <ul>
- * <li>: CommonsPool2TargetSource</li>
- * <li>% ThreadLocalTargetSource</li>
- * <li>! PrototypeTargetSource</li>
- * </ul>
+ * <li>: CommonsPool2TargetSource
+ * <li>% ThreadLocalTargetSource
+ * <li>! PrototypeTargetSource
  *
  * @author Rod Johnson
  * @author Stephane Nicoll

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,7 +146,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 
 	@Override
 	public String toString() {
-		return getClass().getName() + ": class = " + this.clazz.getName() + "; methodName = " + this.methodName;
+		return getClass().getName() + ": class = " + this.clazz.getName() + "; methodName = " + methodName;
 	}
 
 }

spring-aop/src/test/java/org/springframework/aop/support/ClassUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.aop.support;
 
 import org.junit.jupiter.api.Test;
@@ -30,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Rob Harrop
  * @author Rick Evans
  */
-class ClassUtilsTests {
+public class ClassUtilsTests {
 
 	@Test
-	void getShortNameForCglibClass() {
+	public void getShortNameForCglibClass() {
 		TestBean tb = new TestBean();
 		ProxyFactory pf = new ProxyFactory();
 		pf.setTarget(tb);
@@ -42,5 +41,4 @@ class ClassUtilsTests {
 		String className = ClassUtils.getShortName(proxy.getClass());
 		assertThat(className).as("Class name did not match").isEqualTo("TestBean");
 	}
-
 }

spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/ConfigurableObject.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.beans.factory.aspectj;
 
 /**
- * Marker interface for domain objects that need DI through aspects.
+ * Marker interface for domain object that need DI through aspects.
  *
  * @author Ramnivas Laddad
  * @since 2.5
  */
 public interface ConfigurableObject {
+
 }

spring-aspects/src/test/java/org/springframework/cache/aspectj/JCacheAspectJNamespaceConfigTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,18 +22,13 @@ import org.springframework.contextsupport.testfixture.jcache.AbstractJCacheAnnot
 
 /**
  * @author Stephane Nicoll
- * @author Sam Brannen
  */
 public class JCacheAspectJNamespaceConfigTests extends AbstractJCacheAnnotationTests {
 
 	@Override
 	protected ApplicationContext getApplicationContext() {
-		GenericXmlApplicationContext context = new GenericXmlApplicationContext();
-		// Disallow bean definition overriding to test https://github.com/spring-projects/spring-framework/pull/27499
-		context.setAllowBeanDefinitionOverriding(false);
-		context.load("/org/springframework/cache/config/annotation-jcache-aspectj.xml");
-		context.refresh();
-		return context;
+		return new GenericXmlApplicationContext(
+				"/org/springframework/cache/config/annotation-jcache-aspectj.xml");
 	}
 
 }

spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithPrivateAnnotatedMember.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.transaction.aspectj;
 
 import org.springframework.transaction.annotation.Transactional;
@@ -30,5 +29,4 @@ public class ClassWithPrivateAnnotatedMember {
 
 	@Transactional
 	private void doInTransaction() {}
-
 }

spring-aspects/src/test/java/org/springframework/transaction/aspectj/ClassWithProtectedAnnotatedMember.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.transaction.aspectj;
 
 import org.springframework.transaction.annotation.Transactional;
@@ -30,5 +29,4 @@ public class ClassWithProtectedAnnotatedMember {
 
 	@Transactional
 	protected void doInTransaction() {}
-
 }

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

@@ -100,9 +100,9 @@ public abstract class BeanUtils {
 	 * @param clazz class to instantiate
 	 * @return the new instance
 	 * @throws BeanInstantiationException if the bean cannot be instantiated
-	 * @see Class#newInstance()
 	 * @deprecated as of Spring 5.0, following the deprecation of
 	 * {@link Class#newInstance()} in JDK 9
+	 * @see Class#newInstance()
 	 */
 	@Deprecated
 	public static <T> T instantiate(Class<T> clazz) throws BeanInstantiationException {
@@ -226,45 +226,32 @@ public abstract class BeanUtils {
 	}
 
 	/**
-	 * Return a resolvable constructor for the provided class, either a primary or single
-	 * public constructor with arguments, or a single non-public constructor with arguments,
-	 * or simply a default constructor. Callers have to be prepared to resolve arguments
-	 * for the returned constructor's parameters, if any.
+	 * Return a resolvable constructor for the provided class, either a primary constructor
+	 * or single public constructor or simply a default constructor. Callers have to be
+	 * prepared to resolve arguments for the returned constructor's parameters, if any.
 	 * @param clazz the class to check
-	 * @throws IllegalStateException in case of no unique constructor found at all
 	 * @since 5.3
 	 * @see #findPrimaryConstructor
 	 */
 	@SuppressWarnings("unchecked")
 	public static <T> Constructor<T> getResolvableConstructor(Class<T> clazz) {
 		Constructor<T> ctor = findPrimaryConstructor(clazz);
-		if (ctor != null) {
-			return ctor;
-		}
-
-		Constructor<?>[] ctors = clazz.getConstructors();
-		if (ctors.length == 1) {
-			// A single public constructor
-			return (Constructor<T>) ctors[0];
-		}
-		else if (ctors.length == 0){
-			ctors = clazz.getDeclaredConstructors();
+		if (ctor == null) {
+			Constructor<?>[] ctors = clazz.getConstructors();
 			if (ctors.length == 1) {
-				// A single non-public constructor, e.g. from a non-public record type
-				return (Constructor<T>) ctors[0];
+				ctor = (Constructor<T>) ctors[0];
+			}
+			else {
+				try {
+					ctor = clazz.getDeclaredConstructor();
+				}
+				catch (NoSuchMethodException ex) {
+					throw new IllegalStateException("No primary or single public constructor found for " +
+							clazz + " - and no default constructor found either");
+				}
 			}
 		}
-
-		// Several constructors -> let's try to take the default constructor
-		try {
-			return clazz.getDeclaredConstructor();
-		}
-		catch (NoSuchMethodException ex) {
-			// Giving up...
-		}
-
-		// No unique constructor at all
-		throw new IllegalStateException("No primary or single unique constructor found for " + clazz);
+		return ctor;
 	}
 
 	/**
@@ -540,7 +527,7 @@ public abstract class BeanUtils {
 
 	/**
 	 * Find a JavaBeans PropertyEditor following the 'Editor' suffix convention
-	 * (e.g. "mypackage.MyDomainClass" &rarr; "mypackage.MyDomainClassEditor").
+	 * (e.g. "mypackage.MyDomainClass" -> "mypackage.MyDomainClassEditor").
 	 * <p>Compatible to the standard JavaBeans convention as implemented by
 	 * {@link java.beans.PropertyEditorManager} but isolated from the latter's
 	 * registered default editors for primitive types.

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

@@ -134,8 +134,8 @@ public abstract class PropertyAccessorUtils {
 	/**
 	 * Determine the canonical name for the given property path.
 	 * Removes surrounding quotes from map keys:<br>
-	 * {@code map['key']} &rarr; {@code map[key]}<br>
-	 * {@code map["key"]} &rarr; {@code map[key]}
+	 * {@code map['key']} -> {@code map[key]}<br>
+	 * {@code map["key"]} -> {@code map[key]}
 	 * @param propertyName the bean property path
 	 * @return the canonical representation of the property path
 	 */

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -422,13 +422,10 @@ public class PropertyEditorRegistrySupport implements PropertyEditorRegistry {
 			}
 			if (editor == null) {
 				// Find editor for superclass or interface.
-				for (Map.Entry<Class<?>, PropertyEditor> entry : this.customEditors.entrySet()) {
-					if (editor != null) {
-						break;
-					}
-					Class<?> key = entry.getKey();
+				for (Iterator<Class<?>> it = this.customEditors.keySet().iterator(); it.hasNext() && editor == null;) {
+					Class<?> key = it.next();
 					if (key.isAssignableFrom(requiredType)) {
-						editor = entry.getValue();
+						editor = this.customEditors.get(key);
 						// Cache editor for search type, to avoid the overhead
 						// of repeated assignable-from checks.
 						if (this.customEditorCache == null) {

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

@@ -459,7 +459,7 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 		return metadata;
 	}
 
-	private InjectionMetadata buildAutowiringMetadata(Class<?> clazz) {
+	private InjectionMetadata buildAutowiringMetadata(final Class<?> clazz) {
 		if (!AnnotationUtils.isCandidateClass(clazz, this.autowiredAnnotationTypes)) {
 			return InjectionMetadata.EMPTY;
 		}
@@ -539,7 +539,8 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
 	 */
 	@SuppressWarnings({"deprecation", "cast"})
 	protected boolean determineRequiredStatus(MergedAnnotation<?> ann) {
-		return determineRequiredStatus(
+		// The following (AnnotationAttributes) cast is required on JDK 9+.
+		return determineRequiredStatus((AnnotationAttributes)
 				ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
 	}
 

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

@@ -47,17 +47,17 @@ import org.springframework.util.ClassUtils;
  * which uses this class to call a static initialization method:
  *
  * <pre class="code">
- * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingBean"&gt;
- *   &lt;property name="staticMethod" value="com.whatever.MyClass.init"/&gt;
- * &lt;/bean&gt;</pre>
+ * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingBean">
+ *   &lt;property name="staticMethod" value="com.whatever.MyClass.init"/>
+ * &lt;/bean></pre>
  *
  * <p>An example of calling an instance method to start some server bean:
  *
  * <pre class="code">
- * &lt;bean id="myStarter" class="org.springframework.beans.factory.config.MethodInvokingBean"&gt;
- *   &lt;property name="targetObject" ref="myServer"/&gt;
- *   &lt;property name="targetMethod" value="start"/&gt;
- * &lt;/bean&gt;</pre>
+ * &lt;bean id="myStarter" class="org.springframework.beans.factory.config.MethodInvokingBean">
+ *   &lt;property name="targetObject" ref="myServer"/>
+ *   &lt;property name="targetMethod" value="start"/>
+ * &lt;/bean></pre>
  *
  * @author Juergen Hoeller
  * @since 4.0.3

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

@@ -56,24 +56,24 @@ import org.springframework.lang.Nullable;
  * which uses this class to call a static factory method:
  *
  * <pre class="code">
- * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"&gt;
- *   &lt;property name="staticMethod" value="com.whatever.MyClassFactory.getInstance"/&gt;
- * &lt;/bean&gt;</pre>
+ * &lt;bean id="myObject" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ *   &lt;property name="staticMethod" value="com.whatever.MyClassFactory.getInstance"/>
+ * &lt;/bean></pre>
  *
  * <p>An example of calling a static method then an instance method to get at a
  * Java system property. Somewhat verbose, but it works.
  *
  * <pre class="code">
- * &lt;bean id="sysProps" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"&gt;
- *   &lt;property name="targetClass" value="java.lang.System"/&gt;
- *   &lt;property name="targetMethod" value="getProperties"/&gt;
- * &lt;/bean&gt;
+ * &lt;bean id="sysProps" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ *   &lt;property name="targetClass" value="java.lang.System"/>
+ *   &lt;property name="targetMethod" value="getProperties"/>
+ * &lt;/bean>
  *
- * &lt;bean id="javaVersion" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean"&gt;
- *   &lt;property name="targetObject" ref="sysProps"/&gt;
- *   &lt;property name="targetMethod" value="getProperty"/&gt;
- *   &lt;property name="arguments" value="java.version"/&gt;
- * &lt;/bean&gt;</pre>
+ * &lt;bean id="javaVersion" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ *   &lt;property name="targetObject" ref="sysProps"/>
+ *   &lt;property name="targetMethod" value="getProperty"/>
+ *   &lt;property name="arguments" value="java.version"/>
+ * &lt;/bean></pre>
  *
  * @author Colin Sampaleanu
  * @author Juergen Hoeller

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

@@ -83,22 +83,22 @@ import org.springframework.util.StringUtils;
  * <p>A sample config in an XML-based
  * {@link org.springframework.beans.factory.BeanFactory} might look as follows:
  *
- * <pre class="code">&lt;beans&gt;
+ * <pre class="code">&lt;beans>
  *
- *   &lt;!-- Prototype bean since we have state --&gt;
- *   &lt;bean id="myService" class="a.b.c.MyService" singleton="false"/&gt;
+ *   &lt;!-- Prototype bean since we have state -->
+ *   &lt;bean id="myService" class="a.b.c.MyService" singleton="false"/>
  *
- *   &lt;!-- will lookup the above 'myService' bean by *TYPE* --&gt;
+ *   &lt;!-- will lookup the above 'myService' bean by *TYPE* -->
  *   &lt;bean id="myServiceFactory"
- *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean"&gt;
- *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/&gt;
- *   &lt;/bean&gt;
+ *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
+ *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/>
+ *   &lt;/bean>
  *
- *   &lt;bean id="clientBean" class="a.b.c.MyClientBean"&gt;
- *     &lt;property name="myServiceFactory" ref="myServiceFactory"/&gt;
- *   &lt;/bean&gt;
+ *   &lt;bean id="clientBean" class="a.b.c.MyClientBean">
+ *     &lt;property name="myServiceFactory" ref="myServiceFactory"/>
+ *   &lt;/bean>
  *
- *&lt;/beans&gt;</pre>
+ *&lt;/beans></pre>
  *
  * <p>The attendant {@code MyClientBean} class implementation might then
  * look something like this:
@@ -135,22 +135,22 @@ import org.springframework.util.StringUtils;
  * <p>A sample config in an XML-based
  * {@link org.springframework.beans.factory.BeanFactory} might look as follows:
  *
- * <pre class="code">&lt;beans&gt;
+ * <pre class="code">&lt;beans>
  *
- *   &lt;!-- Prototype beans since we have state (both extend MyService) --&gt;
- *   &lt;bean id="specialService" class="a.b.c.SpecialService" singleton="false"/&gt;
- *   &lt;bean id="anotherService" class="a.b.c.AnotherService" singleton="false"/&gt;
+ *   &lt;!-- Prototype beans since we have state (both extend MyService) -->
+ *   &lt;bean id="specialService" class="a.b.c.SpecialService" singleton="false"/>
+ *   &lt;bean id="anotherService" class="a.b.c.AnotherService" singleton="false"/>
  *
  *   &lt;bean id="myServiceFactory"
- *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean"&gt;
- *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/&gt;
- *   &lt;/bean&gt;
+ *            class="org.springframework.beans.factory.config.ServiceLocatorFactoryBean">
+ *     &lt;property name="serviceLocatorInterface" value="a.b.c.ServiceFactory"/>
+ *   &lt;/bean>
  *
- *   &lt;bean id="clientBean" class="a.b.c.MyClientBean"&gt;
- *     &lt;property name="myServiceFactory" ref="myServiceFactory"/&gt;
- *   &lt;/bean&gt;
+ *   &lt;bean id="clientBean" class="a.b.c.MyClientBean">
+ *     &lt;property name="myServiceFactory" ref="myServiceFactory"/>
+ *   &lt;/bean>
  *
- *&lt;/beans&gt;</pre>
+ *&lt;/beans></pre>
  *
  * <p>The attendant {@code MyClientBean} class implementation might then
  * look something like this:

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

@@ -86,7 +86,7 @@ public abstract class YamlProcessor {
 	 * </pre>
 	 * when mapped with
 	 * <pre class="code">
-	 * setDocumentMatchers(properties -&gt;
+	 * setDocumentMatchers(properties ->
 	 *     ("prod".equals(properties.getProperty("environment")) ? MatchStatus.FOUND : MatchStatus.NOT_FOUND));
 	 * </pre>
 	 * would end up as

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

@@ -75,18 +75,18 @@ import org.springframework.util.StringUtils;
  *
  * def reader = new GroovyBeanDefinitionReader(myApplicationContext)
  * reader.beans {
- *     dataSource(BasicDataSource) {                  // <--- invokeMethod
+ *     dataSource(BasicDataSource) {                  // <--- invokeMethod
  *         driverClassName = "org.hsqldb.jdbcDriver"
  *         url = "jdbc:hsqldb:mem:grailsDB"
- *         username = "sa"                            // &lt;-- setProperty
+ *         username = "sa"                            // <-- setProperty
  *         password = ""
  *         settings = [mynew:"setting"]
  *     }
  *     sessionFactory(SessionFactory) {
- *         dataSource = dataSource                    // &lt;-- getProperty for retrieving references
+ *         dataSource = dataSource                    // <-- getProperty for retrieving references
  *     }
  *     myService(MyService) {
- *         nestedBean = { AnotherBean bean -&gt;         // &lt;-- setProperty with closure for nested bean
+ *         nestedBean = { AnotherBean bean ->         // <-- setProperty with closure for nested bean
  *             dataSource = dataSource
  *         }
  *     }
@@ -113,7 +113,7 @@ import org.springframework.util.StringUtils;
  *         dataSource = dataSource
  *     }
  *     myService(MyService) {
- *         nestedBean = { AnotherBean bean -&gt;
+ *         nestedBean = { AnotherBean bean ->
  *             dataSource = dataSource
  *         }
  *     }

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

@@ -1342,7 +1342,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * @param beanName the name of the bean
 	 * @param mbd the bean definition for the bean
 	 * @param explicitArgs argument values passed in programmatically via the getBean method,
-	 * or {@code null} if none (implying the use of constructor argument values from bean definition)
+	 * or {@code null} if none (-> use constructor argument values from bean definition)
 	 * @return a BeanWrapper for the new instance
 	 * @see #getBean(String, Object[])
 	 */
@@ -1363,7 +1363,7 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 	 * @param mbd the bean definition for the bean
 	 * @param ctors the chosen candidate constructors
 	 * @param explicitArgs argument values passed in programmatically via the getBean method,
-	 * or {@code null} if none (implying the use of constructor argument values from bean definition)
+	 * or {@code null} if none (-> use constructor argument values from bean definition)
 	 * @return a BeanWrapper for the new instance
 	 */
 	protected BeanWrapper autowireConstructor(

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -361,7 +361,7 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
 				else {
 					String scopeName = mbd.getScope();
 					if (!StringUtils.hasLength(scopeName)) {
-						throw new IllegalStateException("No scope name defined for bean '" + beanName + "'");
+						throw new IllegalStateException("No scope name defined for bean ´" + beanName + "'");
 					}
 					Scope scope = this.scopes.get(scopeName);
 					if (scope == null) {

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

@@ -61,8 +61,6 @@ import org.springframework.util.StringUtils;
 @SuppressWarnings("serial")
 class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 
-	private static final String DESTROY_METHOD_NAME = "destroy";
-
 	private static final String CLOSE_METHOD_NAME = "close";
 
 	private static final String SHUTDOWN_METHOD_NAME = "shutdown";
@@ -74,11 +72,12 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 
 	private final String beanName;
 
-	private final boolean nonPublicAccessAllowed;
-
 	private final boolean invokeDisposableBean;
 
-	private boolean invokeAutoCloseable;
+	private final boolean nonPublicAccessAllowed;
+
+	@Nullable
+	private final AccessControlContext acc;
 
 	@Nullable
 	private String destroyMethodName;
@@ -89,9 +88,6 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 	@Nullable
 	private final List<DestructionAwareBeanPostProcessor> beanPostProcessors;
 
-	@Nullable
-	private final AccessControlContext acc;
-
 
 	/**
 	 * Create a new DisposableBeanAdapter for the given bean.
@@ -107,45 +103,38 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 		Assert.notNull(bean, "Disposable bean must not be null");
 		this.bean = bean;
 		this.beanName = beanName;
+		this.invokeDisposableBean =
+				(this.bean instanceof DisposableBean && !beanDefinition.isExternallyManagedDestroyMethod("destroy"));
 		this.nonPublicAccessAllowed = beanDefinition.isNonPublicAccessAllowed();
-		this.invokeDisposableBean = (bean instanceof DisposableBean &&
-				!beanDefinition.isExternallyManagedDestroyMethod(DESTROY_METHOD_NAME));
-
-		String destroyMethodName = inferDestroyMethodIfNecessary(bean, beanDefinition);
-		if (destroyMethodName != null &&
-				!(this.invokeDisposableBean && DESTROY_METHOD_NAME.equals(destroyMethodName)) &&
-				!beanDefinition.isExternallyManagedDestroyMethod(destroyMethodName)) {
-
-			this.invokeAutoCloseable = (bean instanceof AutoCloseable && CLOSE_METHOD_NAME.equals(destroyMethodName));
-			if (!this.invokeAutoCloseable) {
-				this.destroyMethodName = destroyMethodName;
-				Method destroyMethod = determineDestroyMethod(destroyMethodName);
-				if (destroyMethod == null) {
-					if (beanDefinition.isEnforceDestroyMethod()) {
-						throw new BeanDefinitionValidationException("Could not find a destroy method named '" +
-								destroyMethodName + "' on bean with name '" + beanName + "'");
-					}
-				}
-				else {
-					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);
-				}
-				this.destroyMethod = destroyMethod;
-			}
-		}
-
-		this.beanPostProcessors = filterPostProcessors(postProcessors, bean);
 		this.acc = acc;
+		String destroyMethodName = inferDestroyMethodIfNecessary(bean, beanDefinition);
+		if (destroyMethodName != null && !(this.invokeDisposableBean && "destroy".equals(destroyMethodName)) &&
+				!beanDefinition.isExternallyManagedDestroyMethod(destroyMethodName)) {
+			this.destroyMethodName = destroyMethodName;
+			Method destroyMethod = determineDestroyMethod(destroyMethodName);
+			if (destroyMethod == null) {
+				if (beanDefinition.isEnforceDestroyMethod()) {
+					throw new BeanDefinitionValidationException("Could not find a destroy method named '" +
+							destroyMethodName + "' on bean with name '" + beanName + "'");
+				}
+			}
+			else {
+				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);
+			}
+			this.destroyMethod = destroyMethod;
+		}
+		this.beanPostProcessors = filterPostProcessors(postProcessors, bean);
 	}
 
 	/**
@@ -160,27 +149,26 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 		Assert.notNull(bean, "Disposable bean must not be null");
 		this.bean = bean;
 		this.beanName = bean.getClass().getName();
-		this.nonPublicAccessAllowed = true;
 		this.invokeDisposableBean = (this.bean instanceof DisposableBean);
-		this.beanPostProcessors = filterPostProcessors(postProcessors, bean);
+		this.nonPublicAccessAllowed = true;
 		this.acc = acc;
+		this.beanPostProcessors = filterPostProcessors(postProcessors, bean);
 	}
 
 	/**
 	 * Create a new DisposableBeanAdapter for the given bean.
 	 */
-	private DisposableBeanAdapter(Object bean, String beanName, boolean nonPublicAccessAllowed,
-			boolean invokeDisposableBean, boolean invokeAutoCloseable, @Nullable String destroyMethodName,
+	private DisposableBeanAdapter(Object bean, String beanName, boolean invokeDisposableBean,
+			boolean nonPublicAccessAllowed, @Nullable String destroyMethodName,
 			@Nullable List<DestructionAwareBeanPostProcessor> postProcessors) {
 
 		this.bean = bean;
 		this.beanName = beanName;
-		this.nonPublicAccessAllowed = nonPublicAccessAllowed;
 		this.invokeDisposableBean = invokeDisposableBean;
-		this.invokeAutoCloseable = invokeAutoCloseable;
+		this.nonPublicAccessAllowed = nonPublicAccessAllowed;
+		this.acc = null;
 		this.destroyMethodName = destroyMethodName;
 		this.beanPostProcessors = postProcessors;
-		this.acc = null;
 	}
 
 
@@ -223,32 +211,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 			}
 		}
 
-		if (this.invokeAutoCloseable) {
-			if (logger.isTraceEnabled()) {
-				logger.trace("Invoking close() on bean with name '" + this.beanName + "'");
-			}
-			try {
-				if (System.getSecurityManager() != null) {
-					AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> {
-						((AutoCloseable) this.bean).close();
-						return null;
-					}, this.acc);
-				}
-				else {
-					((AutoCloseable) this.bean).close();
-				}
-			}
-			catch (Throwable ex) {
-				String msg = "Invocation of close method failed on bean with name '" + this.beanName + "'";
-				if (logger.isDebugEnabled()) {
-					logger.warn(msg, ex);
-				}
-				else {
-					logger.warn(msg + ": " + ex);
-				}
-			}
-		}
-		else if (this.destroyMethod != null) {
+		if (this.destroyMethod != null) {
 			invokeCustomDestroyMethod(this.destroyMethod);
 		}
 		else if (this.destroyMethodName != null) {
@@ -296,7 +259,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 			args[0] = Boolean.TRUE;
 		}
 		if (logger.isTraceEnabled()) {
-			logger.trace("Invoking custom destroy method '" + this.destroyMethodName +
+			logger.trace("Invoking destroy method '" + this.destroyMethodName +
 					"' on bean with name '" + this.beanName + "'");
 		}
 		try {
@@ -319,7 +282,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 			}
 		}
 		catch (InvocationTargetException ex) {
-			String msg = "Custom destroy method '" + this.destroyMethodName + "' on bean with name '" +
+			String msg = "Destroy method '" + this.destroyMethodName + "' on bean with name '" +
 					this.beanName + "' threw an exception";
 			if (logger.isDebugEnabled()) {
 				logger.warn(msg, ex.getTargetException());
@@ -329,7 +292,7 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 			}
 		}
 		catch (Throwable ex) {
-			logger.warn("Failed to invoke custom destroy method '" + this.destroyMethodName +
+			logger.warn("Failed to invoke destroy method '" + this.destroyMethodName +
 					"' on bean with name '" + this.beanName + "'", ex);
 		}
 	}
@@ -349,9 +312,8 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 				}
 			}
 		}
-		return new DisposableBeanAdapter(
-				this.bean, this.beanName, this.nonPublicAccessAllowed, this.invokeDisposableBean,
-				this.invokeAutoCloseable, this.destroyMethodName, serializablePostProcessors);
+		return new DisposableBeanAdapter(this.bean, this.beanName, this.invokeDisposableBean,
+				this.nonPublicAccessAllowed, this.destroyMethodName, serializablePostProcessors);
 	}
 
 
@@ -361,7 +323,10 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 	 * @param beanDefinition the corresponding bean definition
 	 */
 	public static boolean hasDestroyMethod(Object bean, RootBeanDefinition beanDefinition) {
-		return (bean instanceof DisposableBean || inferDestroyMethodIfNecessary(bean, beanDefinition) != null);
+		if (bean instanceof DisposableBean || bean instanceof AutoCloseable) {
+			return true;
+		}
+		return inferDestroyMethodIfNecessary(bean, beanDefinition) != null;
 	}
 
 
@@ -383,27 +348,21 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
 		String destroyMethodName = beanDefinition.resolvedDestroyMethodName;
 		if (destroyMethodName == null) {
 			destroyMethodName = beanDefinition.getDestroyMethodName();
-			boolean autoCloseable = (bean instanceof AutoCloseable);
 			if (AbstractBeanDefinition.INFER_METHOD.equals(destroyMethodName) ||
-					(destroyMethodName == null && autoCloseable)) {
-				// Only perform destroy method inference in case of the bean
-				// not explicitly implementing the DisposableBean interface
+					(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)) {
-					if (autoCloseable) {
-						destroyMethodName = CLOSE_METHOD_NAME;
+					try {
+						destroyMethodName = bean.getClass().getMethod(CLOSE_METHOD_NAME).getName();
 					}
-					else {
+					catch (NoSuchMethodException ex) {
 						try {
-							destroyMethodName = bean.getClass().getMethod(CLOSE_METHOD_NAME).getName();
+							destroyMethodName = bean.getClass().getMethod(SHUTDOWN_METHOD_NAME).getName();
 						}
-						catch (NoSuchMethodException ex) {
-							try {
-								destroyMethodName = bean.getClass().getMethod(SHUTDOWN_METHOD_NAME).getName();
-							}
-							catch (NoSuchMethodException ex2) {
-								// no candidate destroy method found
-							}
+						catch (NoSuchMethodException ex2) {
+							// no candidate destroy method found
 						}
 					}
 				}

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

@@ -21,8 +21,7 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Executable;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.LinkedHashSet;
+import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Supplier;
 
@@ -423,21 +422,15 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
 		return this.factoryMethodToIntrospect;
 	}
 
-	/**
-	 * Register an externally managed configuration method or field.
-	 */
 	public void registerExternallyManagedConfigMember(Member configMember) {
 		synchronized (this.postProcessingLock) {
 			if (this.externallyManagedConfigMembers == null) {
-				this.externallyManagedConfigMembers = new LinkedHashSet<>(1);
+				this.externallyManagedConfigMembers = new HashSet<>(1);
 			}
 			this.externallyManagedConfigMembers.add(configMember);
 		}
 	}
 
-	/**
-	 * Check whether the given method or field is an externally managed configuration member.
-	 */
 	public boolean isExternallyManagedConfigMember(Member configMember) {
 		synchronized (this.postProcessingLock) {
 			return (this.externallyManagedConfigMembers != null &&
@@ -445,33 +438,15 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
 		}
 	}
 
-	/**
-	 * Return all externally managed configuration methods and fields (as an immutable Set).
-	 * @since 5.3.11
-	 */
-	public Set<Member> getExternallyManagedConfigMembers() {
-		synchronized (this.postProcessingLock) {
-			return (this.externallyManagedConfigMembers != null ?
-					Collections.unmodifiableSet(new LinkedHashSet<>(this.externallyManagedConfigMembers)) :
-					Collections.emptySet());
-		}
-	}
-
-	/**
-	 * Register an externally managed configuration initialization method.
-	 */
 	public void registerExternallyManagedInitMethod(String initMethod) {
 		synchronized (this.postProcessingLock) {
 			if (this.externallyManagedInitMethods == null) {
-				this.externallyManagedInitMethods = new LinkedHashSet<>(1);
+				this.externallyManagedInitMethods = new HashSet<>(1);
 			}
 			this.externallyManagedInitMethods.add(initMethod);
 		}
 	}
 
-	/**
-	 * Check whether the given method name indicates an externally managed initialization method.
-	 */
 	public boolean isExternallyManagedInitMethod(String initMethod) {
 		synchronized (this.postProcessingLock) {
 			return (this.externallyManagedInitMethods != null &&
@@ -479,33 +454,15 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
 		}
 	}
 
-	/**
-	 * Return all externally managed initialization methods (as an immutable Set).
-	 * @since 5.3.11
-	 */
-	public Set<String> getExternallyManagedInitMethods() {
-		synchronized (this.postProcessingLock) {
-			return (this.externallyManagedInitMethods != null ?
-					Collections.unmodifiableSet(new LinkedHashSet<>(this.externallyManagedInitMethods)) :
-					Collections.emptySet());
-		}
-	}
-
-	/**
-	 * Register an externally managed configuration destruction method.
-	 */
 	public void registerExternallyManagedDestroyMethod(String destroyMethod) {
 		synchronized (this.postProcessingLock) {
 			if (this.externallyManagedDestroyMethods == null) {
-				this.externallyManagedDestroyMethods = new LinkedHashSet<>(1);
+				this.externallyManagedDestroyMethods = new HashSet<>(1);
 			}
 			this.externallyManagedDestroyMethods.add(destroyMethod);
 		}
 	}
 
-	/**
-	 * Check whether the given method name indicates an externally managed destruction method.
-	 */
 	public boolean isExternallyManagedDestroyMethod(String destroyMethod) {
 		synchronized (this.postProcessingLock) {
 			return (this.externallyManagedDestroyMethods != null &&
@@ -513,18 +470,6 @@ public class RootBeanDefinition extends AbstractBeanDefinition {
 		}
 	}
 
-	/**
-	 * Return all externally managed destruction methods (as an immutable Set).
-	 * @since 5.3.11
-	 */
-	public Set<String> getExternallyManagedDestroyMethods() {
-		synchronized (this.postProcessingLock) {
-			return (this.externallyManagedDestroyMethods != null ?
-					Collections.unmodifiableSet(new LinkedHashSet<>(this.externallyManagedDestroyMethods)) :
-					Collections.emptySet());
-		}
-	}
-
 
 	@Override
 	public RootBeanDefinition cloneBeanDefinition() {

spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java

@@ -39,7 +39,7 @@ import org.springframework.util.xml.XmlValidationModeDetector;
  * when starting your JVM. For example, to use the Oracle {@link DocumentBuilder},
  * you might start your application like as follows:
  *
- * <pre class="code">java -Djavax.xml.parsers.DocumentBuilderFactory=oracle.xml.jaxp.JXDocumentBuilderFactory MyMainClass</pre>
+ * <pre code="class">java -Djavax.xml.parsers.DocumentBuilderFactory=oracle.xml.jaxp.JXDocumentBuilderFactory MyMainClass</pre>
  *
  * @author Rob Harrop
  * @author Juergen Hoeller

spring-beans/src/main/java/org/springframework/beans/factory/xml/ParserContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,24 +64,24 @@ public final class ParserContext {
 	}
 
 
-	public XmlReaderContext getReaderContext() {
+	public final XmlReaderContext getReaderContext() {
 		return this.readerContext;
 	}
 
-	public BeanDefinitionRegistry getRegistry() {
+	public final BeanDefinitionRegistry getRegistry() {
 		return this.readerContext.getRegistry();
 	}
 
-	public BeanDefinitionParserDelegate getDelegate() {
+	public final BeanDefinitionParserDelegate getDelegate() {
 		return this.delegate;
 	}
 
 	@Nullable
-	public BeanDefinition getContainingBeanDefinition() {
+	public final BeanDefinition getContainingBeanDefinition() {
 		return this.containingBeanDefinition;
 	}
 
-	public boolean isNested() {
+	public final boolean isNested() {
 		return (this.containingBeanDefinition != null);
 	}
 

spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java

@@ -71,13 +71,13 @@ public class PluggableSchemaResolver implements EntityResolver {
 
 	private final String schemaMappingsLocation;
 
-	/** Stores the mapping of schema URL → local schema path. */
+	/** Stores the mapping of schema URL -> local schema path. */
 	@Nullable
 	private volatile Map<String, String> schemaMappings;
 
 
 	/**
-	 * Loads the schema URL &rarr; schema file location mappings using the default
+	 * Loads the schema URL -> schema file location mappings using the default
 	 * mapping file pattern "META-INF/spring.schemas".
 	 * @param classLoader the ClassLoader to use for loading
 	 * (can be {@code null}) to use the default ClassLoader)
@@ -89,7 +89,7 @@ public class PluggableSchemaResolver implements EntityResolver {
 	}
 
 	/**
-	 * Loads the schema URL &rarr; schema file location mappings using the given
+	 * Loads the schema URL -> schema file location mappings using the given
 	 * mapping file pattern.
 	 * @param classLoader the ClassLoader to use for loading
 	 * (can be {@code null}) to use the default ClassLoader)

spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/CustomCallbackBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.beans.factory.support.security.support;
 
 /**
@@ -28,5 +27,4 @@ public class CustomCallbackBean {
 	public void destroy() {
 		System.setProperty("security.destroy", "true");
 	}
-
 }

spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/DestroyBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.beans.factory.support.security.support;
 
 import org.springframework.beans.factory.DisposableBean;
@@ -27,5 +26,4 @@ public class DestroyBean implements DisposableBean {
 	public void destroy() throws Exception {
 		System.setProperty("security.destroy", "true");
 	}
-
 }

spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/FactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.beans.factory.support.security.support;
 
 /**
@@ -34,5 +33,4 @@ public class FactoryBean {
 		System.getProperties();
 		return new Object();
 	}
-
 }

spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/InitBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.beans.factory.support.security.support;
 
 import org.springframework.beans.factory.InitializingBean;
@@ -27,5 +26,4 @@ public class InitBean implements InitializingBean {
 	public void afterPropertiesSet() throws Exception {
 		System.getProperties();
 	}
-
 }

spring-beans/src/test/java/org/springframework/beans/factory/support/security/support/PropertyBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.beans.factory.support.security.support;
 
 /**
@@ -28,5 +27,4 @@ public class PropertyBean {
 	public void setProperty(Object property) {
 
 	}
-
 }

spring-beans/src/testFixtures/java/org/springframework/beans/testfixture/beans/DummyBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.beans.testfixture.beans;
 
 /**
@@ -66,5 +65,4 @@ public class DummyBean {
 	public TestBean getSpouse() {
 		return spouse;
 	}
-
 }

spring-context-support/src/main/java/org/springframework/mail/javamail/MimeMessageHelper.java

@@ -896,7 +896,7 @@ public class MimeMessageHelper {
 	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@link #setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
-	 * in the body part, surrounded by angle brackets: e.g. "myId" &rarr; "&lt;myId&gt;".
+	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
 	 * Can be referenced in HTML source via src="cid:myId" expressions.
 	 * @param dataSource the {@code javax.activation.DataSource} to take
 	 * the content from, determining the InputStream and the content type
@@ -923,7 +923,7 @@ public class MimeMessageHelper {
 	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@link #setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
-	 * in the body part, surrounded by angle brackets: e.g. "myId" &rarr; "&lt;myId&gt;".
+	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
 	 * Can be referenced in HTML source via src="cid:myId" expressions.
 	 * @param file the File resource to take the content from
 	 * @throws MessagingException in case of errors
@@ -950,7 +950,7 @@ public class MimeMessageHelper {
 	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@link #setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
-	 * in the body part, surrounded by angle brackets: e.g. "myId" &rarr; "&lt;myId&gt;".
+	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
 	 * Can be referenced in HTML source via src="cid:myId" expressions.
 	 * @param resource the resource to take the content from
 	 * @throws MessagingException in case of errors
@@ -976,7 +976,7 @@ public class MimeMessageHelper {
 	 * <p><b>NOTE:</b> Invoke {@code addInline} <i>after</i> {@code setText};
 	 * else, mail readers might not be able to resolve inline references correctly.
 	 * @param contentId the content ID to use. Will end up as "Content-ID" header
-	 * in the body part, surrounded by angle brackets: e.g. "myId" &rarr; "&lt;myId&gt;".
+	 * in the body part, surrounded by angle brackets: e.g. "myId" -> "&lt;myId&gt;".
 	 * Can be referenced in HTML source via src="cid:myId" expressions.
 	 * @param inputStreamSource the resource to take the content from
 	 * @param contentType the content type to use for the element

spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -570,7 +570,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor implements FactoryBe
 
 		CollectionUtils.mergePropertiesIntoMap(this.quartzProperties, mergedProps);
 		if (this.dataSource != null) {
-			mergedProps.putIfAbsent(StdSchedulerFactory.PROP_JOB_STORE_CLASS, LocalDataSourceJobStore.class.getName());
+			mergedProps.setProperty(StdSchedulerFactory.PROP_JOB_STORE_CLASS, LocalDataSourceJobStore.class.getName());
 		}
 
 		// Determine scheduler name across local settings and Quartz properties...

spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.springframework.scheduling.quartz;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
 import javax.sql.DataSource;
 
@@ -31,7 +30,6 @@ import org.quartz.SchedulerContext;
 import org.quartz.SchedulerFactory;
 import org.quartz.impl.JobDetailImpl;
 import org.quartz.impl.SchedulerRepository;
-import org.quartz.impl.jdbcjobstore.JobStoreTX;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -42,8 +40,6 @@ import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.core.testfixture.EnabledForTestGroups;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -61,10 +57,10 @@ import static org.springframework.core.testfixture.TestGroup.LONG_RUNNING;
  * @author Sam Brannen
  * @since 20.02.2004
  */
-class QuartzSupportTests {
+public class QuartzSupportTests {
 
 	@Test
-	void schedulerFactoryBeanWithApplicationContext() throws Exception {
+	public void schedulerFactoryBeanWithApplicationContext() throws Exception {
 		TestBean tb = new TestBean("tb", 99);
 		StaticApplicationContext ac = new StaticApplicationContext();
 
@@ -101,7 +97,7 @@ class QuartzSupportTests {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	void schedulerWithTaskExecutor() throws Exception {
+	public void schedulerWithTaskExecutor() throws Exception {
 		CountingTaskExecutor taskExecutor = new CountingTaskExecutor();
 		DummyJob.count = 0;
 
@@ -134,7 +130,7 @@ class QuartzSupportTests {
 
 	@Test
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	void jobDetailWithRunnableInsteadOfJob() {
+	public void jobDetailWithRunnableInsteadOfJob() {
 		JobDetailImpl jobDetail = new JobDetailImpl();
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				jobDetail.setJobClass((Class) DummyRunnable.class));
@@ -142,7 +138,7 @@ class QuartzSupportTests {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	void schedulerWithQuartzJobBean() throws Exception {
+	public void schedulerWithQuartzJobBean() throws Exception {
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -175,7 +171,7 @@ class QuartzSupportTests {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	void schedulerWithSpringBeanJobFactory() throws Exception {
+	public void schedulerWithSpringBeanJobFactory() throws Exception {
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -210,7 +206,7 @@ class QuartzSupportTests {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	void schedulerWithSpringBeanJobFactoryAndParamMismatchNotIgnored() throws Exception {
+	public void schedulerWithSpringBeanJobFactoryAndParamMismatchNotIgnored() throws Exception {
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -246,7 +242,7 @@ class QuartzSupportTests {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	void schedulerWithSpringBeanJobFactoryAndQuartzJobBean() throws Exception {
+	public void schedulerWithSpringBeanJobFactoryAndQuartzJobBean() throws Exception {
 		DummyJobBean.param = 0;
 		DummyJobBean.count = 0;
 
@@ -280,7 +276,7 @@ class QuartzSupportTests {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	void schedulerWithSpringBeanJobFactoryAndJobSchedulingData() throws Exception {
+	public void schedulerWithSpringBeanJobFactoryAndJobSchedulingData() throws Exception {
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -298,7 +294,7 @@ class QuartzSupportTests {
 	}
 
 	@Test  // SPR-772
-	void multipleSchedulers() throws Exception {
+	public void multipleSchedulers() throws Exception {
 		try (ClassPathXmlApplicationContext ctx = context("multipleSchedulers.xml")) {
 			Scheduler scheduler1 = (Scheduler) ctx.getBean("scheduler1");
 			Scheduler scheduler2 = (Scheduler) ctx.getBean("scheduler2");
@@ -309,7 +305,7 @@ class QuartzSupportTests {
 	}
 
 	@Test  // SPR-16884
-	void multipleSchedulersWithQuartzProperties() throws Exception {
+	public void multipleSchedulersWithQuartzProperties() throws Exception {
 		try (ClassPathXmlApplicationContext ctx = context("multipleSchedulersWithQuartzProperties.xml")) {
 			Scheduler scheduler1 = (Scheduler) ctx.getBean("scheduler1");
 			Scheduler scheduler2 = (Scheduler) ctx.getBean("scheduler2");
@@ -321,13 +317,12 @@ class QuartzSupportTests {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	void twoAnonymousMethodInvokingJobDetailFactoryBeans() throws Exception {
+	public void twoAnonymousMethodInvokingJobDetailFactoryBeans() throws Exception {
+		Thread.sleep(3000);
 		try (ClassPathXmlApplicationContext ctx = context("multipleAnonymousMethodInvokingJobDetailFB.xml")) {
 			QuartzTestBean exportService = (QuartzTestBean) ctx.getBean("exportService");
 			QuartzTestBean importService = (QuartzTestBean) ctx.getBean("importService");
 
-			Thread.sleep(400);
-
 			assertThat(exportService.getImportCount()).as("doImport called exportService").isEqualTo(0);
 			assertThat(exportService.getExportCount()).as("doExport not called on exportService").isEqualTo(2);
 			assertThat(importService.getImportCount()).as("doImport not called on importService").isEqualTo(2);
@@ -337,13 +332,12 @@ class QuartzSupportTests {
 
 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	void schedulerAccessorBean() throws Exception {
+	public void schedulerAccessorBean() throws Exception {
+		Thread.sleep(3000);
 		try (ClassPathXmlApplicationContext ctx = context("schedulerAccessorBean.xml")) {
 			QuartzTestBean exportService = (QuartzTestBean) ctx.getBean("exportService");
 			QuartzTestBean importService = (QuartzTestBean) ctx.getBean("importService");
 
-			Thread.sleep(400);
-
 			assertThat(exportService.getImportCount()).as("doImport called exportService").isEqualTo(0);
 			assertThat(exportService.getExportCount()).as("doExport not called on exportService").isEqualTo(2);
 			assertThat(importService.getImportCount()).as("doImport not called on importService").isEqualTo(2);
@@ -353,7 +347,7 @@ class QuartzSupportTests {
 
 	@Test
 	@SuppressWarnings("resource")
-	void schedulerAutoStartsOnContextRefreshedEventByDefault() throws Exception {
+	public void schedulerAutoStartsOnContextRefreshedEventByDefault() throws Exception {
 		StaticApplicationContext context = new StaticApplicationContext();
 		context.registerBeanDefinition("scheduler", new RootBeanDefinition(SchedulerFactoryBean.class));
 		Scheduler bean = context.getBean("scheduler", Scheduler.class);
@@ -364,7 +358,7 @@ class QuartzSupportTests {
 
 	@Test
 	@SuppressWarnings("resource")
-	void schedulerAutoStartupFalse() throws Exception {
+	public void schedulerAutoStartupFalse() throws Exception {
 		StaticApplicationContext context = new StaticApplicationContext();
 		BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(SchedulerFactoryBean.class)
 				.addPropertyValue("autoStartup", false).getBeanDefinition();
@@ -376,7 +370,7 @@ class QuartzSupportTests {
 	}
 
 	@Test
-	void schedulerRepositoryExposure() throws Exception {
+	public void schedulerRepositoryExposure() throws Exception {
 		try (ClassPathXmlApplicationContext ctx = context("schedulerRepositoryExposure.xml")) {
 			assertThat(ctx.getBean("scheduler")).isSameAs(SchedulerRepository.getInstance().lookup("myScheduler"));
 		}
@@ -387,7 +381,7 @@ class QuartzSupportTests {
 	 * TODO: Against Quartz 2.2, this test's job doesn't actually execute anymore...
 	 */
 	@Test
-	void schedulerWithHsqlDataSource() throws Exception {
+	public void schedulerWithHsqlDataSource() throws Exception {
 		DummyJob.param = 0;
 		DummyJob.count = 0;
 
@@ -402,36 +396,12 @@ class QuartzSupportTests {
 		}
 	}
 
-	@Test
-	@SuppressWarnings("resource")
-	void schedulerFactoryBeanWithCustomJobStore() throws Exception {
-		StaticApplicationContext context = new StaticApplicationContext();
-
-		String dbName = "mydb";
-		EmbeddedDatabase database = new EmbeddedDatabaseBuilder().setName(dbName).build();
-
-		Properties properties = new Properties();
-		properties.setProperty("org.quartz.jobStore.class", JobStoreTX.class.getName());
-		properties.setProperty("org.quartz.jobStore.dataSource", dbName);
-
-		BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(SchedulerFactoryBean.class)
-				.addPropertyValue("autoStartup", false)
-				.addPropertyValue("dataSource", database)
-				.addPropertyValue("quartzProperties", properties)
-				.getBeanDefinition();
-		context.registerBeanDefinition("scheduler", beanDefinition);
-
-		Scheduler scheduler = context.getBean(Scheduler.class);
-
-		assertThat(scheduler.getMetaData().getJobStoreClass()).isEqualTo(JobStoreTX.class);
-	}
-
 	private ClassPathXmlApplicationContext context(String path) {
 		return new ClassPathXmlApplicationContext(path, getClass());
 	}
 
 
-	private static class CountingTaskExecutor implements TaskExecutor {
+	public static class CountingTaskExecutor implements TaskExecutor {
 
 		private int count;
 
@@ -443,14 +413,12 @@ class QuartzSupportTests {
 	}
 
 
-	private static class DummyJob implements Job {
+	public static class DummyJob implements Job {
 
 		private static int param;
 
 		private static int count;
 
-		@SuppressWarnings("unused")
-		// Must be public
 		public void setParam(int value) {
 			if (param > 0) {
 				throw new IllegalStateException("Param already set");
@@ -465,13 +433,12 @@ class QuartzSupportTests {
 	}
 
 
-	private static class DummyJobBean extends QuartzJobBean {
+	public static class DummyJobBean extends QuartzJobBean {
 
 		private static int param;
 
 		private static int count;
 
-		@SuppressWarnings("unused")
 		public void setParam(int value) {
 			if (param > 0) {
 				throw new IllegalStateException("Param already set");
@@ -486,7 +453,7 @@ class QuartzSupportTests {
 	}
 
 
-	private static class DummyRunnable implements Runnable {
+	public static class DummyRunnable implements Runnable {
 
 		@Override
 		public void run() {

spring-context-support/src/test/resources/org/springframework/scheduling/quartz/multipleAnonymousMethodInvokingJobDetailFB.xml

@@ -19,7 +19,7 @@
 				<property name="targetMethod" value="doExport"/>
 			</bean>
 		</property>
-		<property name="repeatInterval" value="200"/>
+		<property name="repeatInterval" value="1000"/>
 		<property name="repeatCount" value="1"/>
 	</bean>
 
@@ -30,7 +30,7 @@
 				<property name="targetMethod" value="doImport"/>
 			</bean>
 		</property>
-		<property name="repeatInterval" value="200"/>
+		<property name="repeatInterval" value="1000"/>
 		<property name="repeatCount" value="1"/>
 	</bean>
 

spring-context-support/src/test/resources/org/springframework/scheduling/quartz/schedulerAccessorBean.xml

@@ -21,7 +21,7 @@
 				<property name="targetMethod" value="doExport"/>
 			</bean>
 		</property>
-		<property name="repeatInterval" value="200"/>
+		<property name="repeatInterval" value="1000"/>
 		<property name="repeatCount" value="1"/>
 	</bean>
 
@@ -32,7 +32,7 @@
 				<property name="targetMethod" value="doImport"/>
 			</bean>
 		</property>
-		<property name="repeatInterval" value="200"/>
+		<property name="repeatInterval" value="1000"/>
 		<property name="repeatCount" value="1"/>
 	</bean>
 

spring-context/spring-context.gradle

@@ -34,8 +34,8 @@ dependencies {
 	testImplementation("org.codehaus.groovy:groovy-test")
 	testImplementation("org.codehaus.groovy:groovy-xml")
 	testImplementation("org.apache.commons:commons-pool2")
-	testImplementation("org.awaitility:awaitility")
 	testImplementation("javax.inject:javax.inject-tck")
+	testImplementation("org.awaitility:awaitility")
 	testRuntimeOnly("javax.xml.bind:jaxb-api")
 	testRuntimeOnly("org.glassfish:javax.el")
 	// Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central)

spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -244,21 +244,17 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 
 		private static void registerCacheAspect(Element element, ParserContext parserContext) {
 			if (!parserContext.getRegistry().containsBeanDefinition(CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME)) {
-				Object source = parserContext.extractSource(element);
+				Object eleSource = parserContext.extractSource(element);
+				RootBeanDefinition def = new RootBeanDefinition();
+				def.setBeanClassName(JCACHE_ASPECT_CLASS_NAME);
+				def.setFactoryMethodName("aspectOf");
+				BeanDefinition sourceDef = createJCacheOperationSourceBeanDefinition(element, eleSource);
+				String sourceName =
+						parserContext.getReaderContext().registerWithGeneratedName(sourceDef);
+				def.getPropertyValues().add("cacheOperationSource", new RuntimeBeanReference(sourceName));
 
-				BeanDefinition cacheOperationSourceDef = createJCacheOperationSourceBeanDefinition(element, source);
-				String cacheOperationSourceName = parserContext.getReaderContext().registerWithGeneratedName(cacheOperationSourceDef);
-
-				RootBeanDefinition jcacheAspectDef = new RootBeanDefinition();
-				jcacheAspectDef.setBeanClassName(JCACHE_ASPECT_CLASS_NAME);
-				jcacheAspectDef.setFactoryMethodName("aspectOf");
-				jcacheAspectDef.getPropertyValues().add("cacheOperationSource", new RuntimeBeanReference(cacheOperationSourceName));
-				parserContext.getRegistry().registerBeanDefinition(CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME, jcacheAspectDef);
-
-				CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), source);
-				compositeDef.addNestedComponent(new BeanComponentDefinition(cacheOperationSourceDef, cacheOperationSourceName));
-				compositeDef.addNestedComponent(new BeanComponentDefinition(jcacheAspectDef, CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME));
-				parserContext.registerComponent(compositeDef);
+				parserContext.registerBeanComponent(new BeanComponentDefinition(sourceDef, sourceName));
+				parserContext.registerBeanComponent(new BeanComponentDefinition(def, CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME));
 			}
 		}
 

spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java

@@ -156,7 +156,7 @@ public class AnnotationBeanNameGenerator implements BeanNameGenerator {
 	/**
 	 * Derive a default bean name from the given bean definition.
 	 * <p>The default implementation simply builds a decapitalized version
-	 * of the short class name: e.g. "mypackage.MyJdbcDao" &rarr; "myJdbcDao".
+	 * of the short class name: e.g. "mypackage.MyJdbcDao" -> "myJdbcDao".
 	 * <p>Note that inner classes will thus have names of the form
 	 * "outerClassName.InnerClassName", which because of the period in the
 	 * name may be an issue if you are autowiring by name.

spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package org.springframework.context.annotation;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
@@ -425,38 +424,40 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
 				if (traceEnabled) {
 					logger.trace("Scanning " + resource);
 				}
-				try {
-					MetadataReader metadataReader = getMetadataReaderFactory().getMetadataReader(resource);
-					if (isCandidateComponent(metadataReader)) {
-						ScannedGenericBeanDefinition sbd = new ScannedGenericBeanDefinition(metadataReader);
-						sbd.setSource(resource);
-						if (isCandidateComponent(sbd)) {
-							if (debugEnabled) {
-								logger.debug("Identified candidate component class: " + resource);
+				if (resource.isReadable()) {
+					try {
+						MetadataReader metadataReader = getMetadataReaderFactory().getMetadataReader(resource);
+						if (isCandidateComponent(metadataReader)) {
+							ScannedGenericBeanDefinition sbd = new ScannedGenericBeanDefinition(metadataReader);
+							sbd.setSource(resource);
+							if (isCandidateComponent(sbd)) {
+								if (debugEnabled) {
+									logger.debug("Identified candidate component class: " + resource);
+								}
+								candidates.add(sbd);
+							}
+							else {
+								if (debugEnabled) {
+									logger.debug("Ignored because not a concrete top-level class: " + resource);
+								}
 							}
-							candidates.add(sbd);
 						}
 						else {
-							if (debugEnabled) {
-								logger.debug("Ignored because not a concrete top-level class: " + resource);
+							if (traceEnabled) {
+								logger.trace("Ignored because not matching any filter: " + resource);
 							}
 						}
 					}
-					else {
-						if (traceEnabled) {
-							logger.trace("Ignored because not matching any filter: " + resource);
-						}
+					catch (Throwable ex) {
+						throw new BeanDefinitionStoreException(
+								"Failed to read candidate component class: " + resource, ex);
 					}
 				}
-				catch (FileNotFoundException ex) {
+				else {
 					if (traceEnabled) {
-						logger.trace("Ignored non-readable " + resource + ": " + ex.getMessage());
+						logger.trace("Ignored because not readable: " + resource);
 					}
 				}
-				catch (Throwable ex) {
-					throw new BeanDefinitionStoreException(
-							"Failed to read candidate component class: " + resource, ex);
-				}
 			}
 		}
 		catch (IOException ex) {

spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,27 +146,22 @@ import org.springframework.util.StringValueResolver;
 public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBeanPostProcessor
 		implements InstantiationAwareBeanPostProcessor, BeanFactoryAware, Serializable {
 
-	// Defensive reference to JNDI API for JDK 9+ (optional java.naming module)
-	private static final boolean jndiPresent = ClassUtils.isPresent(
-			"javax.naming.InitialContext", CommonAnnotationBeanPostProcessor.class.getClassLoader());
-
-	private static final Set<Class<? extends Annotation>> resourceAnnotationTypes = new LinkedHashSet<>(4);
-
 	@Nullable
 	private static final Class<? extends Annotation> webServiceRefClass;
 
 	@Nullable
 	private static final Class<? extends Annotation> ejbClass;
 
-	static {
-		resourceAnnotationTypes.add(Resource.class);
+	private static final Set<Class<? extends Annotation>> resourceAnnotationTypes = new LinkedHashSet<>(4);
 
+	static {
 		webServiceRefClass = loadAnnotationType("javax.xml.ws.WebServiceRef");
+		ejbClass = loadAnnotationType("javax.ejb.EJB");
+
+		resourceAnnotationTypes.add(Resource.class);
 		if (webServiceRefClass != null) {
 			resourceAnnotationTypes.add(webServiceRefClass);
 		}
-
-		ejbClass = loadAnnotationType("javax.ejb.EJB");
 		if (ejbClass != null) {
 			resourceAnnotationTypes.add(ejbClass);
 		}
@@ -179,8 +174,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 
 	private boolean alwaysUseJndiLookup = false;
 
-	@Nullable
-	private transient BeanFactory jndiFactory;
+	private transient BeanFactory jndiFactory = new SimpleJndiBeanFactory();
 
 	@Nullable
 	private transient BeanFactory resourceFactory;
@@ -205,11 +199,6 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 		setInitAnnotationType(PostConstruct.class);
 		setDestroyAnnotationType(PreDestroy.class);
 		ignoreResourceType("javax.xml.ws.WebServiceContext");
-
-		// java.naming module present on JDK 9+?
-		if (jndiPresent) {
-			this.jndiFactory = new SimpleJndiBeanFactory();
-		}
 	}
 
 
@@ -343,7 +332,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 	}
 
 
-	private InjectionMetadata findResourceMetadata(String beanName, Class<?> clazz, @Nullable PropertyValues pvs) {
+	private InjectionMetadata findResourceMetadata(String beanName, final Class<?> clazz, @Nullable PropertyValues pvs) {
 		// Fall back to class name as cache key, for backwards compatibility with custom callers.
 		String cacheKey = (StringUtils.hasLength(beanName) ? beanName : clazz.getName());
 		// Quick check on the concurrent map first, with minimal locking.
@@ -363,7 +352,7 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 		return metadata;
 	}
 
-	private InjectionMetadata buildResourceMetadata(Class<?> clazz) {
+	private InjectionMetadata buildResourceMetadata(final Class<?> clazz) {
 		if (!AnnotationUtils.isCandidateClass(clazz, resourceAnnotationTypes)) {
 			return InjectionMetadata.EMPTY;
 		}
@@ -475,7 +464,6 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 			public void releaseTarget(Object target) {
 			}
 		};
-
 		ProxyFactory pf = new ProxyFactory();
 		pf.setTargetSource(ts);
 		if (element.lookupType.isInterface()) {
@@ -496,23 +484,12 @@ public class CommonAnnotationBeanPostProcessor extends InitDestroyAnnotationBean
 	protected Object getResource(LookupElement element, @Nullable String requestingBeanName)
 			throws NoSuchBeanDefinitionException {
 
-		// JNDI lookup to perform?
-		String jndiName = null;
 		if (StringUtils.hasLength(element.mappedName)) {
-			jndiName = element.mappedName;
+			return this.jndiFactory.getBean(element.mappedName, element.lookupType);
 		}
-		else if (this.alwaysUseJndiLookup) {
-			jndiName = element.name;
+		if (this.alwaysUseJndiLookup) {
+			return this.jndiFactory.getBean(element.name, element.lookupType);
 		}
-		if (jndiName != null) {
-			if (this.jndiFactory == null) {
-				throw new NoSuchBeanDefinitionException(element.lookupType,
-						"No JNDI factory configured - specify the 'jndiFactory' property");
-			}
-			return this.jndiFactory.getBean(jndiName, element.lookupType);
-		}
-
-		// Regular resource autowiring
 		if (this.resourceFactory == null) {
 			throw new NoSuchBeanDefinitionException(element.lookupType,
 					"No resource factory configured - specify the 'resourceFactory' property");

spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,13 @@
 
 package org.springframework.context.annotation;
 
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
@@ -30,7 +33,12 @@ import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.type.filter.AbstractTypeHierarchyTraversingFilter;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.core.type.filter.AspectJTypeFilter;
+import org.springframework.core.type.filter.AssignableTypeFilter;
+import org.springframework.core.type.filter.RegexPatternTypeFilter;
 import org.springframework.core.type.filter.TypeFilter;
+import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
@@ -65,7 +73,7 @@ class ComponentScanAnnotationParser {
 	}
 
 
-	public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, String declaringClass) {
+	public Set<BeanDefinitionHolder> parse(AnnotationAttributes componentScan, final String declaringClass) {
 		ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(this.registry,
 				componentScan.getBoolean("useDefaultFilters"), this.environment, this.resourceLoader);
 
@@ -85,17 +93,13 @@ class ComponentScanAnnotationParser {
 
 		scanner.setResourcePattern(componentScan.getString("resourcePattern"));
 
-		for (AnnotationAttributes includeFilterAttributes : componentScan.getAnnotationArray("includeFilters")) {
-			List<TypeFilter> typeFilters = TypeFilterUtils.createTypeFiltersFor(includeFilterAttributes, this.environment,
-					this.resourceLoader, this.registry);
-			for (TypeFilter typeFilter : typeFilters) {
+		for (AnnotationAttributes filter : componentScan.getAnnotationArray("includeFilters")) {
+			for (TypeFilter typeFilter : typeFiltersFor(filter)) {
 				scanner.addIncludeFilter(typeFilter);
 			}
 		}
-		for (AnnotationAttributes excludeFilterAttributes : componentScan.getAnnotationArray("excludeFilters")) {
-			List<TypeFilter> typeFilters = TypeFilterUtils.createTypeFiltersFor(excludeFilterAttributes, this.environment,
-				this.resourceLoader, this.registry);
-			for (TypeFilter typeFilter : typeFilters) {
+		for (AnnotationAttributes filter : componentScan.getAnnotationArray("excludeFilters")) {
+			for (TypeFilter typeFilter : typeFiltersFor(filter)) {
 				scanner.addExcludeFilter(typeFilter);
 			}
 		}
@@ -128,4 +132,49 @@ class ComponentScanAnnotationParser {
 		return scanner.doScan(StringUtils.toStringArray(basePackages));
 	}
 
+	private List<TypeFilter> typeFiltersFor(AnnotationAttributes filterAttributes) {
+		List<TypeFilter> typeFilters = new ArrayList<>();
+		FilterType filterType = filterAttributes.getEnum("type");
+
+		for (Class<?> filterClass : filterAttributes.getClassArray("classes")) {
+			switch (filterType) {
+				case ANNOTATION:
+					Assert.isAssignable(Annotation.class, filterClass,
+							"@ComponentScan ANNOTATION type filter requires an annotation type");
+					@SuppressWarnings("unchecked")
+					Class<Annotation> annotationType = (Class<Annotation>) filterClass;
+					typeFilters.add(new AnnotationTypeFilter(annotationType));
+					break;
+				case ASSIGNABLE_TYPE:
+					typeFilters.add(new AssignableTypeFilter(filterClass));
+					break;
+				case CUSTOM:
+					Assert.isAssignable(TypeFilter.class, filterClass,
+							"@ComponentScan CUSTOM type filter requires a TypeFilter implementation");
+
+					TypeFilter filter = ParserStrategyUtils.instantiateClass(filterClass, TypeFilter.class,
+							this.environment, this.resourceLoader, this.registry);
+					typeFilters.add(filter);
+					break;
+				default:
+					throw new IllegalArgumentException("Filter type not supported with Class value: " + filterType);
+			}
+		}
+
+		for (String expression : filterAttributes.getStringArray("pattern")) {
+			switch (filterType) {
+				case ASPECTJ:
+					typeFilters.add(new AspectJTypeFilter(expression, this.resourceLoader.getClassLoader()));
+					break;
+				case REGEX:
+					typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression)));
+					break;
+				default:
+					throw new IllegalArgumentException("Filter type not supported with String pattern: " + filterType);
+			}
+		}
+
+		return typeFilters;
+	}
+
 }

spring-context/src/main/java/org/springframework/context/annotation/Configuration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -129,7 +129,7 @@ import org.springframework.stereotype.Component;
  * @Configuration
  * public class AppConfig {
  *
- *     @Autowired Environment env;
+ *     &#064Autowired Environment env;
  *
  *     @Bean
  *     public MyBean myBean() {
@@ -149,7 +149,7 @@ import org.springframework.stereotype.Component;
  * @PropertySource("classpath:/com/acme/app.properties")
  * public class AppConfig {
  *
- *     @Inject Environment env;
+ *     &#064Inject Environment env;
  *
  *     @Bean
  *     public MyBean myBean() {
@@ -170,7 +170,7 @@ import org.springframework.stereotype.Component;
  * @PropertySource("classpath:/com/acme/app.properties")
  * public class AppConfig {
  *
- *     @Value("${bean.name}") String beanName;
+ *     &#064Value("${bean.name}") String beanName;
  *
  *     @Bean
  *     public MyBean myBean() {
@@ -297,7 +297,7 @@ import org.springframework.stereotype.Component;
  * @ImportResource("classpath:/com/acme/database-config.xml")
  * public class AppConfig {
  *
- *     @Inject DataSource dataSource; // from XML
+ *     &#064Inject DataSource dataSource; // from XML
  *
  *     @Bean
  *     public MyBean myBean() {

spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -453,8 +453,8 @@ class ConfigurationClassEnhancer {
 		 * instance directly. If a FactoryBean instance is fetched through the container via &-dereferencing,
 		 * it will not be proxied. This too is aligned with the way XML configuration works.
 		 */
-		private Object enhanceFactoryBean(Object factoryBean, Class<?> exposedType,
-				ConfigurableBeanFactory beanFactory, String beanName) {
+		private Object enhanceFactoryBean(final Object factoryBean, Class<?> exposedType,
+				final ConfigurableBeanFactory beanFactory, final String beanName) {
 
 			try {
 				Class<?> clazz = factoryBean.getClass();
@@ -489,8 +489,8 @@ class ConfigurationClassEnhancer {
 			return createCglibProxyForFactoryBean(factoryBean, beanFactory, beanName);
 		}
 
-		private Object createInterfaceProxyForFactoryBean(Object factoryBean, Class<?> interfaceType,
-				ConfigurableBeanFactory beanFactory, String beanName) {
+		private Object createInterfaceProxyForFactoryBean(final Object factoryBean, Class<?> interfaceType,
+				final ConfigurableBeanFactory beanFactory, final String beanName) {
 
 			return Proxy.newProxyInstance(
 					factoryBean.getClass().getClassLoader(), new Class<?>[] {interfaceType},
@@ -502,8 +502,8 @@ class ConfigurationClassEnhancer {
 					});
 		}
 
-		private Object createCglibProxyForFactoryBean(Object factoryBean,
-				ConfigurableBeanFactory beanFactory, String beanName) {
+		private Object createCglibProxyForFactoryBean(final Object factoryBean,
+				final ConfigurableBeanFactory beanFactory, final String beanName) {
 
 			Enhancer enhancer = new Enhancer();
 			enhancer.setSuperclass(factoryBean.getClass());

spring-context/src/main/java/org/springframework/context/annotation/EnableAspectJAutoProxy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ import java.lang.annotation.Target;
  * @EnableAspectJAutoProxy
  * public class AppConfig {
  *
- *     // no explicit @Bean definitions required
+ *     // no explicit &#064Bean definitions required
  * }</pre>
  *
  * <b>Note: {@code @EnableAspectJAutoProxy} applies to its local application context only,

spring-context/src/main/java/org/springframework/context/annotation/Lazy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,11 +47,6 @@ import java.lang.annotation.Target;
  * or {@link javax.inject.Inject}: In that context, it leads to the creation of a
  * lazy-resolution proxy for all affected dependencies, as an alternative to using
  * {@link org.springframework.beans.factory.ObjectFactory} or {@link javax.inject.Provider}.
- * Please note that such a lazy-resolution proxy will always be injected; if the target
- * dependency does not exist, you will only be able to find out through an exception on
- * invocation. As a consequence, such an injection point results in unintuitive behavior
- * for optional dependencies. For a programmatic equivalent, allowing for lazy references
- * with more sophistication, consider {@link org.springframework.beans.factory.ObjectProvider}.
  *
  * @author Chris Beams
  * @author Juergen Hoeller

spring-context/src/main/java/org/springframework/context/annotation/TypeFilterUtils.java

@@ -1,119 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.context.annotation;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.core.type.filter.AspectJTypeFilter;
-import org.springframework.core.type.filter.AssignableTypeFilter;
-import org.springframework.core.type.filter.RegexPatternTypeFilter;
-import org.springframework.core.type.filter.TypeFilter;
-import org.springframework.util.Assert;
-
-/**
- * Collection of utilities for working with {@link ComponentScan @ComponentScan}
- * {@linkplain ComponentScan.Filter type filters}.
- *
- * @author Chris Beams
- * @author Juergen Hoeller
- * @author Sam Brannen
- * @since 5.3.13
- * @see ComponentScan.Filter
- * @see org.springframework.core.type.filter.TypeFilter
- */
-public abstract class TypeFilterUtils {
-
-	/**
-	 * Create {@linkplain TypeFilter type filters} from the supplied
-	 * {@link AnnotationAttributes}, such as those sourced from
-	 * {@link ComponentScan#includeFilters()} or {@link ComponentScan#excludeFilters()}.
-	 * <p>Each {@link TypeFilter} will be instantiated using an appropriate
-	 * constructor, with {@code BeanClassLoaderAware}, {@code BeanFactoryAware},
-	 * {@code EnvironmentAware}, and {@code ResourceLoaderAware} contracts
-	 * invoked if they are implemented by the type filter.
-	 * @param filterAttributes {@code AnnotationAttributes} for a
-	 * {@link ComponentScan.Filter @Filter} declaration
-	 * @param environment the {@code Environment} to make available to filters
-	 * @param resourceLoader the {@code ResourceLoader} to make available to filters
-	 * @param registry the {@code BeanDefinitionRegistry} to make available to filters
-	 * as a {@link org.springframework.beans.factory.BeanFactory} if applicable
-	 * @return a list of instantiated and configured type filters
-	 * @see TypeFilter
-	 * @see AnnotationTypeFilter
-	 * @see AssignableTypeFilter
-	 * @see AspectJTypeFilter
-	 * @see RegexPatternTypeFilter
-	 * @see org.springframework.beans.factory.BeanClassLoaderAware
-	 * @see org.springframework.beans.factory.BeanFactoryAware
-	 * @see org.springframework.context.EnvironmentAware
-	 * @see org.springframework.context.ResourceLoaderAware
-	 */
-	public static List<TypeFilter> createTypeFiltersFor(AnnotationAttributes filterAttributes, Environment environment,
-			ResourceLoader resourceLoader, BeanDefinitionRegistry registry) {
-
-		List<TypeFilter> typeFilters = new ArrayList<>();
-		FilterType filterType = filterAttributes.getEnum("type");
-
-		for (Class<?> filterClass : filterAttributes.getClassArray("classes")) {
-			switch (filterType) {
-				case ANNOTATION:
-					Assert.isAssignable(Annotation.class, filterClass,
-							"@ComponentScan ANNOTATION type filter requires an annotation type");
-					@SuppressWarnings("unchecked")
-					Class<Annotation> annotationType = (Class<Annotation>) filterClass;
-					typeFilters.add(new AnnotationTypeFilter(annotationType));
-					break;
-				case ASSIGNABLE_TYPE:
-					typeFilters.add(new AssignableTypeFilter(filterClass));
-					break;
-				case CUSTOM:
-					Assert.isAssignable(TypeFilter.class, filterClass,
-							"@ComponentScan CUSTOM type filter requires a TypeFilter implementation");
-					TypeFilter filter = ParserStrategyUtils.instantiateClass(filterClass, TypeFilter.class,
-							environment, resourceLoader, registry);
-					typeFilters.add(filter);
-					break;
-				default:
-					throw new IllegalArgumentException("Filter type not supported with Class value: " + filterType);
-			}
-		}
-
-		for (String expression : filterAttributes.getStringArray("pattern")) {
-			switch (filterType) {
-				case ASPECTJ:
-					typeFilters.add(new AspectJTypeFilter(expression, resourceLoader.getClassLoader()));
-					break;
-				case REGEX:
-					typeFilters.add(new RegexPatternTypeFilter(Pattern.compile(expression)));
-					break;
-				default:
-					throw new IllegalArgumentException("Filter type not supported with String pattern: " + filterType);
-			}
-		}
-
-		return typeFilters;
-	}
-
-}

spring-context/src/main/java/org/springframework/context/expression/CachedExpressionEvaluator.java

@@ -75,7 +75,7 @@ public abstract class CachedExpressionEvaluator {
 
 	/**
 	 * Return the {@link Expression} for the specified SpEL value
-	 * <p>{@link #parseExpression(String) Parse the expression} if it hasn't been already.
+	 * <p>Parse the expression if it hasn't been already.
 	 * @param cache the cache to use
 	 * @param elementKey the element on which the expression is defined
 	 * @param expression the expression to parse
@@ -86,21 +86,12 @@ public abstract class CachedExpressionEvaluator {
 		ExpressionKey expressionKey = createKey(elementKey, expression);
 		Expression expr = cache.get(expressionKey);
 		if (expr == null) {
-			expr = parseExpression(expression);
+			expr = getParser().parseExpression(expression);
 			cache.put(expressionKey, expr);
 		}
 		return expr;
 	}
 
-	/**
-	 * Parse the specified {@code expression}.
-	 * @param expression the expression to parse
-	 * @since 5.3.13
-	 */
-	protected Expression parseExpression(String expression) {
-		return getParser().parseExpression(expression);
-	}
-
 	private ExpressionKey createKey(AnnotatedElementKey elementKey, String expression) {
 		return new ExpressionKey(elementKey, expression);
 	}

spring-context/src/main/java/org/springframework/context/expression/StandardBeanExpressionResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import org.springframework.beans.factory.BeanExpressionException;
 import org.springframework.beans.factory.config.BeanExpressionContext;
 import org.springframework.beans.factory.config.BeanExpressionResolver;
 import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.ParserContext;
@@ -157,10 +156,10 @@ public class StandardBeanExpressionResolver implements BeanExpressionResolver {
 				sec.addPropertyAccessor(new EnvironmentAccessor());
 				sec.setBeanResolver(new BeanFactoryResolver(evalContext.getBeanFactory()));
 				sec.setTypeLocator(new StandardTypeLocator(evalContext.getBeanFactory().getBeanClassLoader()));
-				sec.setTypeConverter(new StandardTypeConverter(() -> {
-					ConversionService cs = evalContext.getBeanFactory().getConversionService();
-					return (cs != null ? cs : DefaultConversionService.getSharedInstance());
-				}));
+				ConversionService conversionService = evalContext.getBeanFactory().getConversionService();
+				if (conversionService != null) {
+					sec.setTypeConverter(new StandardTypeConverter(conversionService));
+				}
 				customizeEvaluationContext(sec);
 				this.evaluationCache.put(evalContext, sec);
 			}

spring-context/src/main/java/org/springframework/context/index/CandidateComponentsIndexLoader.java

@@ -107,7 +107,7 @@ public final class CandidateComponentsIndexLoader {
 				result.add(properties);
 			}
 			if (logger.isDebugEnabled()) {
-				logger.debug("Loaded " + result.size() + " index(es)");
+				logger.debug("Loaded " + result.size() + "] index(es)");
 			}
 			int totalCount = result.stream().mapToInt(Properties::size).sum();
 			return (totalCount > 0 ? new CandidateComponentsIndex(result) : null);

spring-context/src/main/java/org/springframework/context/support/GenericGroovyApplicationContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,18 +46,18 @@ import org.springframework.lang.Nullable;
  *
  * def context = new GenericGroovyApplicationContext()
  * context.reader.beans {
- *     dataSource(BasicDataSource) {                  // <--- invokeMethod
+ *     dataSource(BasicDataSource) {                  // <--- invokeMethod
  *         driverClassName = "org.hsqldb.jdbcDriver"
  *         url = "jdbc:hsqldb:mem:grailsDB"
- *         username = "sa"                            // &lt;-- setProperty
+ *         username = "sa"                            // <-- setProperty
  *         password = ""
  *         settings = [mynew:"setting"]
  *     }
  *     sessionFactory(SessionFactory) {
- *         dataSource = dataSource                    // &lt;-- getProperty for retrieving references
+ *         dataSource = dataSource                    // <-- getProperty for retrieving references
  *     }
  *     myService(MyService) {
- *         nestedBean = { AnotherBean bean -&gt;         // &lt;-- setProperty with closure for nested bean
+ *         nestedBean = { AnotherBean bean ->         // <-- setProperty with closure for nested bean
  *             dataSource = dataSource
  *         }
  *     }
@@ -84,7 +84,7 @@ import org.springframework.lang.Nullable;
  *         dataSource = dataSource
  *     }
  *     myService(MyService) {
- *         nestedBean = { AnotherBean bean -&gt;
+ *         nestedBean = { AnotherBean bean ->
  *             dataSource = dataSource
  *         }
  *     }

spring-context/src/main/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -185,9 +185,9 @@ public class PropertySourcesPlaceholderConfigurer extends PlaceholderConfigurerS
 	/**
 	 * Implemented for compatibility with
 	 * {@link org.springframework.beans.factory.config.PlaceholderConfigurerSupport}.
-	 * @throws UnsupportedOperationException in this implementation
 	 * @deprecated in favor of
 	 * {@link #processProperties(ConfigurableListableBeanFactory, ConfigurablePropertyResolver)}
+	 * @throws UnsupportedOperationException in this implementation
 	 */
 	@Override
 	@Deprecated

spring-context/src/main/java/org/springframework/context/support/ReloadableResourceBundleMessageSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -229,7 +229,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
 	 * for a Locale, after merging all specified resource bundles.
 	 * Either fetches the holder from the cache or freshly loads it.
 	 * <p>Only used when caching resource bundle contents forever, i.e.
-	 * with cacheSeconds &lt; 0. Therefore, merged properties are always
+	 * with cacheSeconds < 0. Therefore, merged properties are always
 	 * cached forever.
 	 */
 	protected PropertiesHolder getMergedProperties(Locale locale) {
@@ -315,7 +315,7 @@ public class ReloadableResourceBundleMessageSource extends AbstractResourceBased
 	/**
 	 * Calculate the filenames for the given bundle basename and Locale,
 	 * appending language code, country code, and variant code.
-	 * <p>For example, basename "messages", Locale "de_AT_oo" &rarr; "messages_de_AT_OO",
+	 * E.g.: basename "messages", Locale "de_AT_oo" -> "messages_de_AT_OO",
 	 * "messages_de_AT", "messages_de".
 	 * <p>Follows the rules defined by {@link java.util.Locale#toString()}.
 	 * @param basename the basename of the bundle

spring-context/src/main/java/org/springframework/format/FormatterRegistrar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.format;
 
 import org.springframework.core.convert.converter.Converter;

spring-context/src/main/java/org/springframework/format/support/DefaultFormattingConversionService.java

@@ -37,7 +37,7 @@ import org.springframework.util.StringValueResolver;
  * as {@code DefaultConversionService} exposes its own
  * {@link DefaultConversionService#addDefaultConverters addDefaultConverters} method.
  *
- * <p>Automatically registers formatters for JSR-354 Money &amp; Currency, JSR-310 Date-Time
+ * <p>Automatically registers formatters for JSR-354 Money & Currency, JSR-310 Date-Time
  * and/or Joda-Time 2.x, depending on the presence of the corresponding API on the classpath.
  *
  * @author Chris Beams
@@ -100,7 +100,7 @@ public class DefaultFormattingConversionService extends FormattingConversionServ
 
 	/**
 	 * Add formatters appropriate for most environments: including number formatters,
-	 * JSR-354 Money &amp; Currency formatters, JSR-310 Date-Time and/or Joda-Time formatters,
+	 * JSR-354 Money & Currency formatters, JSR-310 Date-Time and/or Joda-Time formatters,
 	 * depending on the presence of the corresponding API on the classpath.
 	 * @param formatterRegistry the service to register default formatters with
 	 */

spring-context/src/main/java/org/springframework/jndi/JndiCallback.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,8 +44,8 @@ public interface JndiCallback<T> {
 	 * <p>Implementations don't need to worry about error handling
 	 * or cleanup, as the JndiTemplate class will handle this.
 	 * @param ctx the current JNDI context
-	 * @return a result object, or {@code null}
 	 * @throws NamingException if thrown by JNDI methods
+	 * @return a result object, or {@code null}
 	 */
 	@Nullable
 	T doInContext(Context ctx) throws NamingException;

spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiClientInterceptor.java

@@ -56,7 +56,7 @@ import org.springframework.util.Assert;
  * For example:
  *
  * <pre class="code">&lt;property name="jndiEnvironment"&gt;
- * 	 &lt;props&gt;
+ * 	 &lt;props>
  *		 &lt;prop key="java.naming.factory.initial"&gt;com.sun.jndi.cosnaming.CNCtxFactory&lt;/prop&gt;
  *		 &lt;prop key="java.naming.provider.url"&gt;iiop://localhost:1050&lt;/prop&gt;
  *	 &lt;/props&gt;

spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiProxyFactoryBean.java

@@ -43,7 +43,7 @@ import org.springframework.util.ClassUtils;
  * For example:
  *
  * <pre class="code">&lt;property name="jndiEnvironment"&gt;
- * 	 &lt;props&gt;
+ * 	 &lt;props>
  *		 &lt;prop key="java.naming.factory.initial"&gt;com.sun.jndi.cosnaming.CNCtxFactory&lt;/prop&gt;
  *		 &lt;prop key="java.naming.provider.url"&gt;iiop://localhost:1050&lt;/prop&gt;
  *	 &lt;/props&gt;

spring-context/src/main/java/org/springframework/remoting/rmi/JndiRmiServiceExporter.java

@@ -52,7 +52,7 @@ import org.springframework.util.ReflectionUtils;
  * For example:
  *
  * <pre class="code">&lt;property name="jndiEnvironment"&gt;
- * 	 &lt;props&gt;
+ * 	 &lt;props>
  *		 &lt;prop key="java.naming.factory.initial"&gt;com.sun.jndi.cosnaming.CNCtxFactory&lt;/prop&gt;
  *		 &lt;prop key="java.naming.provider.url"&gt;iiop://localhost:1050&lt;/prop&gt;
  *	 &lt;/props&gt;

spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java

@@ -75,6 +75,7 @@ public class AsyncAnnotationAdvisor extends AbstractPointcutAdvisor implements B
 	 * handle unexpected exception thrown by asynchronous method executions
 	 * @see AnnotationAsyncExecutionInterceptor#getDefaultExecutor(BeanFactory)
 	 */
+	@SuppressWarnings("unchecked")
 	public AsyncAnnotationAdvisor(
 			@Nullable Executor executor, @Nullable AsyncUncaughtExceptionHandler exceptionHandler) {
 

spring-context/src/main/java/org/springframework/scheduling/support/CronExpression.java

@@ -171,6 +171,7 @@ public final class CronExpression {
 	 * <li>{@code "@daily"} (or {@code "@midnight"}) to run once a day, i.e. {@code "0 0 0 * * *"},</li>
 	 * <li>{@code "@hourly"} to run once an hour, i.e. {@code "0 0 * * * *"}.</li>
 	 * </ul>
+	 *
 	 * @param expression the expression string to parse
 	 * @return the parsed {@code CronExpression} object
 	 * @throws IllegalArgumentException in the expression does not conform to

spring-context/src/main/java/org/springframework/scheduling/support/CronTrigger.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -105,11 +105,11 @@ public class CronTrigger implements Trigger {
 			}
 		}
 		else {
-			date = new Date(triggerContext.getClock().millis());
+			date = new Date();
 		}
 		ZonedDateTime dateTime = ZonedDateTime.ofInstant(date.toInstant(), this.zoneId);
 		ZonedDateTime next = this.expression.next(dateTime);
-		return (next != null ? Date.from(next.toInstant()) : null);
+		return next != null ? Date.from(next.toInstant()) : null;
 	}
 
 

spring-context/src/main/java/org/springframework/ui/context/support/ResourceBundleThemeSource.java

@@ -87,7 +87,7 @@ public class ResourceBundleThemeSource implements HierarchicalThemeSource, BeanC
 	/**
 	 * Set the prefix that gets applied to the ResourceBundle basenames,
 	 * i.e. the theme names.
-	 * E.g.: basenamePrefix="test.", themeName="theme" → basename="test.theme".
+	 * E.g.: basenamePrefix="test.", themeName="theme" -> basename="test.theme".
 	 * <p>Note that ResourceBundle names are effectively classpath locations: As a
 	 * consequence, the JDK's standard ResourceBundle treats dots as package separators.
 	 * This means that "test.theme" is effectively equivalent to "test/theme",

spring-context/src/main/java/org/springframework/validation/Errors.java

@@ -83,8 +83,8 @@ public interface Errors {
 	 * {@code pushNestedPath(String)} call.
 	 * <p>Using the nested path stack allows to set temporary nested paths
 	 * for subobjects without having to worry about a temporary path holder.
-	 * <p>For example: current path "spouse.", pushNestedPath("child") &rarr;
-	 * result path "spouse.child."; popNestedPath() &rarr; "spouse." again.
+	 * <p>For example: current path "spouse.", pushNestedPath("child") ->
+	 * result path "spouse.child."; popNestedPath() -> "spouse." again.
 	 * @param subPath the sub path to push onto the nested path stack
 	 * @see #popNestedPath
 	 */

spring-context/src/main/java/org/springframework/validation/Validator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ package org.springframework.validation;
  * wholly of whitespace), and that any password that is present is
  * at least {@code 'MINIMUM_PASSWORD_LENGTH'} characters in length.
  *
- * <pre class="code">public class UserLoginValidator implements Validator {
+ * <pre class="code"> public class UserLoginValidator implements Validator {
  *
  *    private static final int MINIMUM_PASSWORD_LENGTH = 6;
  *
@@ -46,7 +46,7 @@ package org.springframework.validation;
  *       ValidationUtils.rejectIfEmptyOrWhitespace(errors, "password", "field.required");
  *       UserLogin login = (UserLogin) target;
  *       if (login.getPassword() != null
- *             &amp;&amp; login.getPassword().trim().length() &lt; MINIMUM_PASSWORD_LENGTH) {
+ *             && login.getPassword().trim().length() < MINIMUM_PASSWORD_LENGTH) {
  *          errors.rejectValue("password", "field.min.length",
  *                new Object[]{Integer.valueOf(MINIMUM_PASSWORD_LENGTH)},
  *                "The password must be at least [" + MINIMUM_PASSWORD_LENGTH + "] characters in length.");

spring-context/src/test/java/example/scannable/FooServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,6 @@ import org.springframework.util.Assert;
 public abstract class FooServiceImpl implements FooService {
 
 	// Just to test ASM5's bytecode parsing of INVOKESPECIAL/STATIC on interfaces
-	@SuppressWarnings("unused")
 	private static final Comparator<MessageBean> COMPARATOR_BY_MESSAGE = Comparator.comparing(MessageBean::getMessage);
 
 

spring-context/src/test/java/org/springframework/aop/aspectj/ImplicitJPArgumentMatchingTests.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.aop.aspectj;
 
 import org.aspectj.lang.ProceedingJoinPoint;

spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java

@@ -48,6 +48,7 @@ import org.springframework.core.NestedRuntimeException;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.lang.Nullable;
+import org.springframework.util.StopWatch;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -309,6 +310,12 @@ public class AspectJAutoProxyCreatorTests {
 		return String.format("%s-%s", getClass().getSimpleName(), fileSuffix);
 	}
 
+	private void assertStopWatchTimeLimit(final StopWatch sw, final long maxTimeMillis) {
+		long totalTimeMillis = sw.getTotalTimeMillis();
+		assertThat(totalTimeMillis < maxTimeMillis).as("'" + sw.getLastTaskName() + "' took too long: expected less than<" + maxTimeMillis +
+				"> ms, actual<" + totalTimeMillis + "> ms.").isTrue();
+	}
+
 }
 
 @Aspect("pertarget(execution(* *.getSpouse()))")

spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -513,7 +513,6 @@ public class CglibProxyTests extends AbstractAopProxyTests implements Serializab
 			this.name = name;
 		}
 
-		@SuppressWarnings("unused")
 		public String getName() {
 			return this.name;
 		}

spring-context/src/test/java/org/springframework/context/annotation/AggressiveFactoryBeanInstantiationTests.java

@@ -137,7 +137,6 @@ public class AggressiveFactoryBeanInstantiationTests {
 
 	static class ExceptionInInitializer {
 
-		@SuppressWarnings("unused")
 		private static final int ERROR = callInClinit();
 
 		private static int callInClinit() {

spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostConstructAndAutowiringTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.springframework.beans.testfixture.beans.TestBean;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+
 /**
  * Tests cornering the issue reported in SPR-8080. If the product of a @Bean method
  * was @Autowired into a configuration class while at the same time the declaring
@@ -33,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * 'currently in creation' status of the autowired bean and result in creating multiple
  * instances of the given @Bean, violating container scoping / singleton semantics.
  *
- * <p>This is resolved through no longer relying on 'currently in creation' status, but
+ * This is resolved through no longer relying on 'currently in creation' status, but
  * rather on a thread local that informs the enhanced bean method implementation whether
  * the factory is the caller or not.
  *

spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -1956,7 +1956,6 @@ class ConfigurationClassPostProcessorTests {
 		}
 
 		// Unrelated, not to be considered as a factory method
-		@SuppressWarnings("unused")
 		private boolean testBean(boolean param) {
 			return param;
 		}
@@ -1986,7 +1985,6 @@ class ConfigurationClassPostProcessorTests {
 		}
 
 		// Unrelated, not to be considered as a factory method
-		@SuppressWarnings("unused")
 		private boolean testBean(boolean param) {
 			return param;
 		}

spring-context/src/test/java/org/springframework/context/annotation/DestroyMethodInferenceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import org.springframework.context.support.GenericXmlApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+
 /**
  * @author Chris Beams
  * @author Juergen Hoeller
@@ -46,7 +47,6 @@ public class DestroyMethodInferenceTests {
 		WithLocalShutdownMethod c7 = ctx.getBean("c7", WithLocalShutdownMethod.class);
 		WithInheritedCloseMethod c8 = ctx.getBean("c8", WithInheritedCloseMethod.class);
 		WithDisposableBean c9 = ctx.getBean("c9", WithDisposableBean.class);
-		WithAutoCloseable c10 = ctx.getBean("c10", WithAutoCloseable.class);
 
 		assertThat(c0.closed).as("c0").isFalse();
 		assertThat(c1.closed).as("c1").isFalse();
@@ -58,8 +58,6 @@ public class DestroyMethodInferenceTests {
 		assertThat(c7.closed).as("c7").isFalse();
 		assertThat(c8.closed).as("c8").isFalse();
 		assertThat(c9.closed).as("c9").isFalse();
-		assertThat(c10.closed).as("c10").isFalse();
-
 		ctx.close();
 		assertThat(c0.closed).as("c0").isTrue();
 		assertThat(c1.closed).as("c1").isTrue();
@@ -71,7 +69,6 @@ public class DestroyMethodInferenceTests {
 		assertThat(c7.closed).as("c7").isTrue();
 		assertThat(c8.closed).as("c8").isFalse();
 		assertThat(c9.closed).as("c9").isTrue();
-		assertThat(c10.closed).as("c10").isTrue();
 	}
 
 	@Test
@@ -83,29 +80,21 @@ public class DestroyMethodInferenceTests {
 		WithLocalCloseMethod x3 = ctx.getBean("x3", WithLocalCloseMethod.class);
 		WithNoCloseMethod x4 = ctx.getBean("x4", WithNoCloseMethod.class);
 		WithInheritedCloseMethod x8 = ctx.getBean("x8", WithInheritedCloseMethod.class);
-		WithDisposableBean x9 = ctx.getBean("x9", WithDisposableBean.class);
-		WithAutoCloseable x10 = ctx.getBean("x10", WithAutoCloseable.class);
 
 		assertThat(x1.closed).isFalse();
 		assertThat(x2.closed).isFalse();
 		assertThat(x3.closed).isFalse();
 		assertThat(x4.closed).isFalse();
-		assertThat(x8.closed).isFalse();
-		assertThat(x9.closed).isFalse();
-		assertThat(x10.closed).isFalse();
-
 		ctx.close();
 		assertThat(x1.closed).isFalse();
 		assertThat(x2.closed).isTrue();
 		assertThat(x3.closed).isTrue();
 		assertThat(x4.closed).isFalse();
 		assertThat(x8.closed).isFalse();
-		assertThat(x9.closed).isTrue();
-		assertThat(x10.closed).isTrue();
 	}
 
 
-	@Configuration(proxyBeanMethods = false)
+	@Configuration
 	static class Config {
 
 		@Bean(destroyMethod = "explicitClose")
@@ -166,11 +155,6 @@ public class DestroyMethodInferenceTests {
 		public WithDisposableBean c9() {
 			return new WithDisposableBean();
 		}
-
-		@Bean
-		public WithAutoCloseable c10() {
-			return new WithAutoCloseable();
-		}
 	}
 
 
@@ -205,6 +189,17 @@ public class DestroyMethodInferenceTests {
 	}
 
 
+	static class WithDisposableBean implements DisposableBean {
+
+		boolean closed = false;
+
+		@Override
+		public void destroy() {
+			closed = true;
+		}
+	}
+
+
 	static class WithNoCloseMethod {
 
 		boolean closed = false;
@@ -220,26 +215,4 @@ public class DestroyMethodInferenceTests {
 		}
 	}
 
-
-	static class WithDisposableBean implements DisposableBean {
-
-		boolean closed = false;
-
-		@Override
-		public void destroy() {
-			closed = true;
-		}
-	}
-
-
-	static class WithAutoCloseable implements AutoCloseable {
-
-		boolean closed = false;
-
-		@Override
-		public void close() {
-			closed = true;
-		}
-	}
-
 }

spring-context/src/test/java/org/springframework/context/annotation/InvalidConfigurationClassDefinitionTests.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.context.annotation;
 
 import org.junit.jupiter.api.Test;

spring-context/src/test/java/org/springframework/context/annotation/ParserStrategyUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ public class ParserStrategyUtilsTests {
 
 	@BeforeEach
 	void setup() {
-		MockitoAnnotations.openMocks(this);
+		MockitoAnnotations.initMocks(this);
 		given(this.resourceLoader.getClassLoader()).willReturn(this.beanClassLoader);
 	}
 

spring-context/src/test/java/org/springframework/context/annotation/Spr12278Tests.java

@@ -74,7 +74,6 @@ public class Spr12278Tests {
 		private final String autowiredName;
 
 		// No @Autowired - implicit wiring
-		@SuppressWarnings("unused")
 		public SingleConstructorComponent(String autowiredName) {
 			this.autowiredName = autowiredName;
 		}
@@ -89,13 +88,11 @@ public class Spr12278Tests {
 			this.name = name;
 		}
 
-		@SuppressWarnings("unused")
 		public TwoConstructorsComponent() {
 			this("fallback");
 		}
 	}
 
-	@SuppressWarnings("unused")
 	private static class TwoSpecificConstructorsComponent {
 
 		private final Integer counter;

spring-context/src/test/java/org/springframework/context/annotation/Spr16179Tests.java

@@ -70,7 +70,6 @@ public class Spr16179Tests {
 		Assembler<Page<String>> assembler2;
 
 		@Autowired(required = false)
-		@SuppressWarnings("rawtypes")
 		Assembler<Page> assembler3;
 
 		@Autowired(required = false)

spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java

@@ -42,6 +42,7 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.DependencyDescriptor;
 import org.springframework.beans.factory.config.ListFactoryBean;
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -246,9 +247,7 @@ public class ConfigurationClassProcessingTests {
 	public void configurationWithPostProcessor() {
 		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
 		ctx.register(ConfigWithPostProcessor.class);
-		@SuppressWarnings("deprecation")
-		RootBeanDefinition placeholderConfigurer = new RootBeanDefinition(
-				org.springframework.beans.factory.config.PropertyPlaceholderConfigurer.class);
+		RootBeanDefinition placeholderConfigurer = new RootBeanDefinition(PropertyPlaceholderConfigurer.class);
 		placeholderConfigurer.getPropertyValues().add("properties", "myProp=myValue");
 		ctx.registerBeanDefinition("placeholderConfigurer", placeholderConfigurer);
 		ctx.refresh();
@@ -537,7 +536,6 @@ public class ConfigurationClassProcessingTests {
 
 				String nameSuffix = "-processed-" + myProp;
 
-				@SuppressWarnings("unused")
 				public void setNameSuffix(String nameSuffix) {
 					this.nameSuffix = nameSuffix;
 				}
@@ -554,6 +552,10 @@ public class ConfigurationClassProcessingTests {
 				public Object postProcessAfterInitialization(Object bean, String beanName) {
 					return bean;
 				}
+
+				public int getOrder() {
+					return 0;
+				}
 			};
 		}
 

spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportResourceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.support.PropertiesBeanDefinitionReader;
 import org.springframework.beans.testfixture.beans.TestBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -165,10 +166,8 @@ public class ImportResourceTests {
 		}
 	}
 
-	@SuppressWarnings("deprecation")
 	@Configuration
-	@ImportResource(locations = "classpath:org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties",
-			reader = org.springframework.beans.factory.support.PropertiesBeanDefinitionReader.class)
+	@ImportResource(locations = "classpath:org/springframework/context/annotation/configuration/ImportNonXmlResourceConfig-context.properties", reader = PropertiesBeanDefinitionReader.class)
 	static class ImportNonXmlResourceConfig {
 	}
 

spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportWithConditionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,6 @@ public class ImportWithConditionTests {
 	protected static class ConditionalThenUnconditional {
 
 		@Autowired
-		@SuppressWarnings("unused")
 		private BeanOne beanOne;
 	}
 
@@ -69,7 +68,6 @@ public class ImportWithConditionTests {
 	protected static class UnconditionalThenConditional {
 
 		@Autowired
-		@SuppressWarnings("unused")
 		private BeanOne beanOne;
 	}
 

spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,6 @@ public class ImportedConfigurationClassEnhancementTests {
 		autowiredConfigClassIsEnhanced(ConfigThatDoesNotImport.class, ConfigToBeAutowired.class);
 	}
 
-	@SuppressWarnings("deprecation")
 	private void autowiredConfigClassIsEnhanced(Class<?>... configClasses) {
 		ApplicationContext ctx = new AnnotationConfigApplicationContext(configClasses);
 		Config config = ctx.getBean(Config.class);

spring-context/src/test/java/org/springframework/context/annotation/configuration/Spr7167Tests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 public class Spr7167Tests {
 
-	@SuppressWarnings("deprecation")
 	@Test
 	public void test() {
 		ConfigurableApplicationContext ctx = new AnnotationConfigApplicationContext(MyConfig.class);

spring-context/src/test/java/org/springframework/context/expression/CachedExpressionEvaluatorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-context/src/test/java/org/springframework/context/expression/MapAccessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,17 +67,6 @@ public class MapAccessorTests {
 		assertThat(ex.getValue(sec,mapGetter)).isEqualTo("bar");
 		assertThat(SpelCompiler.compile(ex)).isTrue();
 		assertThat(ex.getValue(sec,mapGetter)).isEqualTo("bar");
-
-		// basic isWritable
-		ex = sep.parseExpression("foo");
-		assertThat(ex.isWritable(sec,testMap)).isTrue();
-
-		// basic write
-		ex = sep.parseExpression("foo2");
-		ex.setValue(sec, testMap, "bar2");
-		assertThat(ex.getValue(sec,testMap)).isEqualTo("bar2");
-		assertThat(SpelCompiler.compile(ex)).isTrue();
-		assertThat(ex.getValue(sec,testMap)).isEqualTo("bar2");
 	}
 
 	public static class MapGetter {

spring-context/src/test/java/org/springframework/context/support/BeanFactoryPostProcessorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.MutablePropertyValues;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -74,7 +75,6 @@ public class BeanFactoryPostProcessorTests {
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
 	public void testMultipleDefinedBeanFactoryPostProcessors() {
 		StaticApplicationContext ac = new StaticApplicationContext();
 		ac.registerSingleton("tb1", TestBean.class);
@@ -84,7 +84,7 @@ public class BeanFactoryPostProcessorTests {
 		ac.registerSingleton("bfpp1", TestBeanFactoryPostProcessor.class, pvs1);
 		MutablePropertyValues pvs2 = new MutablePropertyValues();
 		pvs2.add("properties", "key=value");
-		ac.registerSingleton("bfpp2", org.springframework.beans.factory.config.PropertyPlaceholderConfigurer.class, pvs2);
+		ac.registerSingleton("bfpp2", PropertyPlaceholderConfigurer.class, pvs2);
 		ac.refresh();
 		TestBeanFactoryPostProcessor bfpp = (TestBeanFactoryPostProcessor) ac.getBean("bfpp1");
 		assertThat(bfpp.initValue).isEqualTo("value");

spring-context/src/test/java/org/springframework/context/support/LiveBeansViewTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@ import static org.mockito.Mockito.mock;
  * @author Stephane Nicoll
  * @author Sam Brannen
  */
-@SuppressWarnings("deprecation")
 class LiveBeansViewTests {
 
 	private final MockEnvironment environment = new MockEnvironment();

spring-context/src/test/java/org/springframework/context/support/PropertyResourceConfigurerIntegrationTests.java

@@ -43,7 +43,6 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
  * @author Sam Brannen
  * @see org.springframework.beans.factory.config.PropertyResourceConfigurerTests
  */
-@SuppressWarnings("deprecation")
 public class PropertyResourceConfigurerIntegrationTests {
 
 	@Test

spring-context/src/test/java/org/springframework/context/support/PropertySourcesPlaceholderConfigurerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ import static org.springframework.beans.factory.support.BeanDefinitionBuilder.ro
  */
 public class PropertySourcesPlaceholderConfigurerTests {
 
+
 	@Test
 	public void replacementFromEnvironmentProperties() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
@@ -396,7 +397,6 @@ public class PropertySourcesPlaceholderConfigurerTests {
 			return name;
 		}
 
-		@SuppressWarnings("unused")
 		public void setName(Optional<String> name) {
 			this.name = name;
 		}