Release v5.3.9

2026-06-08 17:33:33 +00:00 · 2021-07-14 06:36:18 +00:00
706 changed files with 5270 additions and 8199 deletions
@@ -8,4 +8,4 @@ wiki page.

 ## Reporting a Vulnerability

-Please see https://spring.io/security-policy.
+Please see https://pivotal.io/security.
@@ -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.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 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
+	id 'io.spring.nohttp' version '0.0.5.RELEASE'
+	id 'org.jetbrains.kotlin.jvm' version '1.5.21' apply false
+	id 'org.jetbrains.dokka' version '0.10.1' apply false
+	id 'org.asciidoctor.jvm.convert' version '3.1.0'
+	id 'org.asciidoctor.jvm.pdf' version '3.1.0'
+	id 'de.undercouch.download' version '4.1.1'
+	id "io.freefair.aspectj" version '5.1.1' apply false
+	id "com.github.ben-manes.versions" version '0.28.0'
+	id "com.github.johnrengelman.shadow" version "6.1.0" apply false
+	id "me.champeau.jmh" version "0.6.4" apply false
+	id "org.jetbrains.kotlin.plugin.serialization" version "1.5.21" apply false
 	id "org.unbroken-dome.xjc" version '2.0.0' apply false
-	id "com.github.ben-manes.versions" version '0.39.0'
-	id "com.github.johnrengelman.shadow" version '7.0.0' apply false
-	id 'de.undercouch.download' version '4.1.2'
-	id "me.champeau.jmh" version "0.6.6" apply false
 }

 ext {
@@ -27,16 +27,16 @@ 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 "com.fasterxml.jackson:jackson-bom:2.12.4"
+			mavenBom "io.netty:netty-bom:4.1.65.Final"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.9"
 			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.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.eclipse.jetty:jetty-bom:9.4.43.v20210629"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.21"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.1"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.1"
+			mavenBom "org.junit:junit-bom:5.7.2"
 		}
 		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
@@ -67,23 +67,22 @@ configure(allprojects) { project ->
 			dependency "io.reactivex:rxjava:1.3.8"
 			dependency "io.reactivex:rxjava-reactive-streams:1.2.1"
 			dependency "io.reactivex.rxjava2:rxjava:2.2.21"
-			dependency "io.reactivex.rxjava3:rxjava:3.1.1"
-			dependency "io.smallrye.reactive:mutiny:1.1.1"
-			dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE"
+			dependency "io.reactivex.rxjava3:rxjava:3.0.13"
+			dependency "io.projectreactor.tools:blockhound:1.0.4.RELEASE"

 			dependency "com.caucho:hessian:4.0.63"
 			dependency "com.fasterxml:aalto-xml:1.3.0"
 			dependency("com.fasterxml.woodstox:woodstox-core:6.2.6") {
 				exclude group: "stax", name: "stax-api"
 			}
-			dependency "com.google.code.gson:gson:2.8.8"
-			dependency "com.google.protobuf:protobuf-java-util:3.18.0"
+			dependency "com.google.code.gson:gson:2.8.7"
+			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") {
+			dependency("com.thoughtworks.xstream:xstream:1.4.17") {
 				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 +94,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 +124,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.50') {
 				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.50') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.12.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.8.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,28 +187,27 @@ 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.11.0') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 				entry 'mockito-junit-jupiter'
 			}
-			dependency "io.mockk:mockk:1.12.0"
+			dependency "io.mockk:mockk:1.11.0"

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

 			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {
@@ -314,8 +312,6 @@ configure([rootProject] + javaProjects) { project ->

 	pluginManager.withPlugin("kotlin") {
 		apply plugin: "org.jetbrains.dokka"
-		apply from: "${rootDir}/gradle/docs-dokka.gradle"
-
 		compileKotlin {
 			kotlinOptions {
 				languageVersion = "1.3"
@@ -340,36 +336,35 @@ configure([rootProject] + javaProjects) { project ->
 	}

 	checkstyle {
-		toolVersion = "9.0"
+		toolVersion = "8.44"
 		configDirectory.set(rootProject.file("src/checkstyle"))
 	}

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

 	ext.javadocLinks = [
 			"https://docs.oracle.com/javase/8/docs/api/",
 			"https://docs.oracle.com/javaee/7/api/",
 			"https://docs.oracle.com/cd/E13222_01/wls/docs90/javadocs/",  // CommonJ
-			"https://www.ibm.com/docs/api/v1/content/SSEQTP_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
+			"https://www.ibm.com/support/knowledgecenter/SS7JFU_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/",
+			"https://glassfish.java.net/nonav/docs/v3/api/",
 			"https://docs.jboss.org/jbossas/javadoc/4.0.5/connector/",
 			"https://docs.jboss.org/jbossas/javadoc/7.1.2.Final/",
 			"https://tiles.apache.org/tiles-request/apidocs/",
@@ -383,12 +378,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://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/"
+			"https://junit.org/junit5/docs/5.7.2/api/"
 	] as String[]
 }

@@ -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 {
@@ -32,7 +32,6 @@ import org.gradle.api.tasks.compile.JavaCompile;
 *
 * @author Brian Clozel
 * @author Sam Brannen
- * @author Sebastien Deleuze
 */
 public class CompilerConventionsPlugin implements Plugin<Project> {

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

 	@Override
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package org.springframework.build.optional;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.attributes.Usage;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginConvention;
 import org.gradle.api.tasks.SourceSetContainer;
@@ -29,7 +28,7 @@ import org.gradle.plugins.ide.eclipse.model.EclipseModel;
 /**
 * A {@code Plugin} that adds support for Maven-style optional dependencies. Creates a new
 * {@code optional} configuration. The {@code optional} configuration is part of the
- * project's compile and runtime classpaths but does not affect the classpath of
+ * project's compile and runtime classpath's but does not affect the classpath of
 * dependent projects.
 *
 * @author Andy Wilkinson
@@ -44,16 +43,22 @@ public class OptionalDependenciesPlugin implements Plugin<Project> {
 	@Override
 	public void apply(Project project) {
 		Configuration optional = project.getConfigurations().create("optional");
-		optional.setCanBeConsumed(false);
-		optional.setCanBeResolved(false);
 		project.getPlugins().withType(JavaPlugin.class, (javaPlugin) -> {
-			SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class)
-					.getSourceSets();
+			SourceSetContainer sourceSets = project.getConvention()
+					.getPlugin(JavaPluginConvention.class).getSourceSets();
 			sourceSets.all((sourceSet) -> {
-				project.getConfigurations().getByName(sourceSet.getCompileClasspathConfigurationName()).extendsFrom(optional);
-				project.getConfigurations().getByName(sourceSet.getRuntimeClasspathConfigurationName()).extendsFrom(optional);
+				sourceSet.setCompileClasspath(
+						sourceSet.getCompileClasspath().plus(optional));
+				sourceSet.setRuntimeClasspath(
+						sourceSet.getRuntimeClasspath().plus(optional));
 			});
 		});
+		project.getPlugins().withType(EclipsePlugin.class, (eclipePlugin) -> {
+			project.getExtensions().getByType(EclipseModel.class)
+					.classpath((classpath) -> {
+						classpath.getPlusConfigurations().add(optional);
+					});
+		});
 	}

 }
@@ -4,7 +4,7 @@ changelog:
    - title: ":star: New Features"
      labels:
        - "type: enhancement"
-    - title: ":lady_beetle: Bug Fixes"
+    - title: ":beetle: Bug Fixes"
      labels:
        - "type: bug"
        - "type: regression"
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20210827
+FROM ubuntu:focal-20210119

 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
@@ -6,6 +6,6 @@ RUN ./setup.sh java8

 ENV JAVA_HOME /opt/openjdk/java8
 ENV JDK11 /opt/openjdk/java11
-ENV JDK16 /opt/openjdk/java16
+ENV JDK15 /opt/openjdk/java15

 ENV PATH $JAVA_HOME/bin:$PATH
@@ -3,13 +3,13 @@ set -e

 case "$1" in
 	java8)
-		 echo "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz"
+		 echo "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz"
 	;;
 	java11)
-		 echo "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz"
+		 echo "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz"
 	;;
-  java16)
-		 echo "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz"
+  java15)
+		 echo "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz"
  ;;
  *)
 		echo $"Unknown java version"
@@ -22,7 +22,7 @@ curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/

 mkdir -p /opt/openjdk
 pushd /opt/openjdk > /dev/null
-for jdk in java8 java11 java16
+for jdk in java8 java11 java15
 do
  JDK_URL=$( /get-jdk-url.sh $jdk )
  mkdir $jdk
@@ -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"
@@ -2,7 +2,7 @@ anchors:
  git-repo-resource-source: &git-repo-resource-source
    uri: ((github-repo))
    username: ((github-username))
-    password: ((github-ci-release-token))
+    password: ((github-password))
    branch: ((branch))
  gradle-enterprise-task-params: &gradle-enterprise-task-params
    GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
@@ -45,12 +45,7 @@ resource_types:
  type: registry-image
  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
+    tag: 0.0.13
 - name: github-status-resource
  type: registry-image
  source:
@@ -124,14 +119,14 @@ resources:
    access_token: ((github-ci-status-token))
    branch: ((branch))
    context: jdk11-build
- name: repo-status-jdk16-build
+- name: repo-status-jdk15-build
  type: github-status-resource
  icon: eye-check-outline
  source:
    repository: ((github-repo-name))
    access_token: ((github-ci-status-token))
    branch: ((branch))
-    context: jdk16-build
+    context: jdk15-build
 - name: slack-alert
  type: slack-notification
  icon: slack
@@ -249,7 +244,7 @@ jobs:
          <<: *slack-fail-params
  - put: repo-status-jdk11-build
    params: { state: "success", commit: "git-repo" }
- name: jdk16-build
+- name: jdk15-build
  serial: true
  public: true
  plan:
@@ -257,7 +252,7 @@ jobs:
    - get: git-repo
    - get: every-morning
      trigger: true
-    - put: repo-status-jdk16-build
+    - put: repo-status-jdk15-build
      params: { state: "pending", commit: "git-repo" }
    - do:
      - task: check-project
@@ -270,12 +265,12 @@ jobs:
          <<: *build-project-task-params
      on_failure:
        do:
-          - put: repo-status-jdk16-build
+          - put: repo-status-jdk15-build
            params: { state: "failure", commit: "git-repo" }
          - put: slack-alert
            params:
              <<: *slack-fail-params
-    - put: repo-status-jdk16-build
+    - put: repo-status-jdk15-build
      params: { state: "success", commit: "git-repo" }
 - name: build-pull-requests
  serial: true
@@ -297,7 +292,7 @@ jobs:
        privileged: true
        timeout: ((task-timeout))
        params:
-          BRANCH: ((branch))
+          <<: *build-project-task-params
      on_success:
        put: git-pull-request
        params:
@@ -458,7 +453,7 @@ jobs:

 groups:
 - name: "builds"
-  jobs: ["build", "jdk11-build", "jdk16-build"]
+  jobs: ["build", "jdk11-build", "jdk15-build"]
 - name: "releases"
  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
 - name: "ci-images"
@@ -29,8 +29,8 @@ fi
 echo "Staging $stageVersion (next version will be $nextVersion)"
 sed -i "s/version=$snapshotVersion/version=$stageVersion/" gradle.properties

-git config user.name "Spring Builds" > /dev/null
-git config user.email "spring-builds@users.noreply.github.com" > /dev/null
+git config user.name "Spring Buildmaster" > /dev/null
+git config user.email "buildmaster@springframework.org" > /dev/null
 git add gradle.properties > /dev/null
 git commit -m"Release v$stageVersion" > /dev/null
 git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
@@ -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
@@ -1,4 +1,4 @@
-version=5.3.13
+version=5.3.9
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true
@@ -1,30 +0,0 @@
-tasks.findByName("dokkaHtmlPartial")?.configure {
-	outputDirectory.set(new File(buildDir, "docs/kdoc"))
-	dokkaSourceSets {
-		configureEach {
-			sourceRoots.setFrom(file("src/main/kotlin"))
-			classpath.from(sourceSets["main"].runtimeClasspath)
-			externalDocumentationLink {
-				url.set(new URL("https://docs.spring.io/spring-framework/docs/current/javadoc-api/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://projectreactor.io/docs/core/release/api/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://kotlin.github.io/kotlinx.coroutines/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://javadoc.io/doc/org.hamcrest/hamcrest/2.1/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://javadoc.io/doc/javax.servlet/javax.servlet-api/latest/"))
-			}
-			externalDocumentationLink {
-				url.set(new URL("https://javadoc.io/static/io.rsocket/rsocket-core/1.1.1/"))
-			}
-		}
-	}
-}
@@ -46,9 +46,8 @@ task api(type: Javadoc) {
 		stylesheetFile = file("src/docs/api/stylesheet.css")
 		splitIndex = true
 		links(project.ext.javadocLinks)
-		addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint
-		addBooleanOption('Xwerror', true) // fail build on Javadoc warnings
-		if (JavaVersion.current().isJava9Compatible()) {
+		addStringOption('Xdoclint:none', '-quiet')
+		if(JavaVersion.current().isJava9Compatible()) {
 			addBooleanOption('html5', true)
 		}
 	}
@@ -62,13 +61,57 @@ task api(type: Javadoc) {
 /**
 * Produce KDoc for all Spring Framework modules in "build/docs/kdoc"
 */
-pluginManager.withPlugin("kotlin") {
-	tasks.dokkaHtmlMultiModule.configure {
-		dependsOn {
-			tasks.getByName("api")
+dokka {
+	dependsOn {
+		tasks.getByName("api")
+	}
+
+	doFirst {
+		configuration {
+			classpath = moduleProjects.collect { project -> project.jar.outputs.files.getFiles() }.flatten()
+			classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
+
+			moduleProjects.findAll {
+				it.pluginManager.hasPlugin("kotlin")
+			}.each { project ->
+				def kotlinDirs = project.sourceSets.main.kotlin.srcDirs.collect()
+				kotlinDirs -= project.sourceSets.main.java.srcDirs
+				kotlinDirs.each { dir ->
+					if (dir.exists()) {
+						sourceRoot {
+							path = dir.path
+						}
+					}
+				}
+			}
+		}
+	}
+
+	outputFormat = "html"
+	outputDirectory = "$buildDir/docs/kdoc"
+
+	configuration {
+		moduleName = "spring-framework"
+
+		externalDocumentationLink {
+			url = new URL("https://docs.spring.io/spring-framework/docs/$version/javadoc-api/")
+			packageListUrl = new File(buildDir, "docs/javadoc/package-list").toURI().toURL()
+		}
+		externalDocumentationLink {
+			url = new URL("https://projectreactor.io/docs/core/release/api/")
+		}
+		externalDocumentationLink {
+			url = new URL("https://www.reactive-streams.org/reactive-streams-1.0.1-javadoc/")
+		}
+/*
+		This link causes errors, removing to fix the build.
+		externalDocumentationLink {
+			url = new URL("https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/")
+		}
+*/
+		externalDocumentationLink {
+			url = new URL("https://r2dbc.io/spec/0.8.3.RELEASE/api/")
 		}
-		moduleName.set("spring-framework")
-		outputDirectory.set(project.file("$buildDir/docs/kdoc"))
 	}
 }

@@ -96,7 +139,7 @@ asciidoctorj {
 			icons: 'font',
 			idprefix: '',
 			idseparator: '-',
-			docinfo: 'shared,private-header', // https://docs.asciidoctor.org/asciidoctor/latest/docinfo/
+			docinfo: 'shared',
 			revnumber: project.version,
 			sectanchors: '',
 			sectnums: '',
@@ -120,6 +163,9 @@ asciidoctorj {
 asciidoctor {
 	baseDirFollowsSourceDir()
 	configurations 'asciidoctorExt'
+	attributes([
+			noheader: '' // custom header in docinfo-header.html
+	])
 	sources {
 		include '*.adoc'
 	}
@@ -150,7 +196,7 @@ asciidoctorPdf {
 /**
 * Zip all docs (API and reference) into a single archive
 */
-task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokkaHtmlMultiModule']) {
+task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokka']) {
 	group = "Distribution"
 	description = "Builds -${archiveClassifier} archive containing api and reference " +
 			"for deployment at https://docs.spring.io/spring-framework/docs."
@@ -169,7 +215,7 @@ task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dok
 	from ("$asciidoctorPdf.outputDir") {
 		into "reference/pdf"
 	}
-	from (dokkaHtmlMultiModule.outputDirectory) {
+	from (dokka) {
 		into "kdoc-api"
 	}
 }
@@ -226,11 +272,11 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
 		expand(copyright: new Date().format("yyyy"), version: project.version)
 	}

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

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

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

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

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

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

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

@@ -69,20 +64,47 @@ 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 cleanEclipseSettings(type: Delete) {
-	delete project.file('.settings/org.eclipse.jdt.core.prefs')
-	delete project.file('.settings/org.eclipse.jdt.ui.prefs')
+task eclipseWstComponent(type: Copy) {
+	from rootProject.files(
+		"src/eclipse/org.eclipse.wst.common.component")
+	into project.file('.settings/')
+	expand(deployname: project.name)
+	outputs.upToDateWhen { false }
 }

-tasks['eclipse'].dependsOn(eclipseSettings)
-tasks['eclipseJdt'].dependsOn(eclipseSettings)
-tasks['cleanEclipse'].dependsOn(cleanEclipseSettings)
+task eclipseJdtPrepare(type: Copy) {
+	from rootProject.file("src/eclipse/org.eclipse.jdt.core.prefs")
+	into project.file(".settings/")
+	outputs.upToDateWhen { false }
+}
+
+task cleanEclipseJdtUi(type: Delete) {
+	delete project.file(".settings/org.eclipse.jdt.core.prefs")
+	delete project.file(".settings/org.eclipse.jdt.ui.prefs")
+	delete project.file(".settings/org.eclipse.wst.common.component")
+	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
+}
+
+task eclipseBuildship(type: Copy) {
+	from rootProject.files(
+		"src/eclipse/org.eclipse.jdt.ui.prefs",
+		"src/eclipse/org.eclipse.jdt.core.prefs")
+	into project.file('.settings/')
+	outputs.upToDateWhen { false }
+}
+
+tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare)
+tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi)
+tasks["eclipse"].dependsOn(eclipseSettings, eclipseWstComponent)
@@ -8,19 +8,15 @@ apply plugin: 'me.champeau.jmh'
 apply from: "$rootDir/gradle/publications.gradle"

 dependencies {
-	jmh 'org.openjdk.jmh:jmh-core:1.32'
-	jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.32'
-	jmh 'net.sf.jopt-simple:jopt-simple'
+	jmh 'org.openjdk.jmh:jmh-core:1.28'
+	jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.28'
+	jmh 'net.sf.jopt-simple:jopt-simple:4.6'
 }

 jmh {
 	duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE
 }

-tasks.findByName("processJmhResources").configure {
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
 jmhJar {
 	// Uncomment the following for Shadow's Transformer support.
 	// mergeServiceFiles()
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`

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

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

-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

 exec "$JAVACMD" "$@"
@@ -3,11 +3,11 @@
 This document will guide you through the process of importing the Spring Framework
 projects into Eclipse or the Spring Tool Suite (_STS_). It is recommended that you
 have a recent version of Eclipse. As a bare minimum you will need Eclipse with full Java
-8 support, Eclipse Buildship, and the Groovy plugin.
+8 support, Eclipse Buildship, the Kotlin plugin, and the Groovy plugin.

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

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

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

 ## Known Issues

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

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

 normalization {
@@ -1,7 +1,7 @@
 pluginManagement {
 	repositories {
 		gradlePluginPortal()
-		maven { url "https://repo.spring.io/plugins-release" }
+		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 }

@@ -17,6 +17,8 @@ include "spring-context"
 include "spring-context-indexer"
 include "spring-context-support"
 include "spring-core"
+include "kotlin-coroutines"
+project(':kotlin-coroutines').projectDir = file('spring-core/kotlin-coroutines')
 include "spring-expression"
 include "spring-instrument"
 include "spring-jcl"
@@ -49,7 +51,7 @@ settings.gradle.projectsLoaded {
 			buildScanPublished { scan ->
 				if (buildDir.exists()) {
 					new File(buildDir, "build-scan-uri.txt").text = "${scan.buildScanUri}\n"
-				}
+				} 
 			}
 		}
 	}
@@ -1,13 +1,12 @@
 description = "Spring AOP"

 dependencies {
-	api(project(":spring-beans"))
-	api(project(":spring-core"))
+	compile(project(":spring-beans"))
+	compile(project(":spring-core"))
 	optional("org.aspectj:aspectjweaver")
 	optional("org.apache.commons:commons-pool2")
 	optional("com.jamonapi:jamon")
-	testImplementation(testFixtures(project(":spring-beans")))
-	testImplementation(testFixtures(project(":spring-core")))
-	testFixturesImplementation(testFixtures(project(":spring-beans")))
+	testCompile(testFixtures(project(":spring-beans")))
+	testCompile(testFixtures(project(":spring-core")))
 	testFixturesImplementation(testFixtures(project(":spring-core")))
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
 * terminology).
 *
 * <p>A runtime joinpoint is an <i>event</i> that occurs on a static
- * joinpoint (i.e. a location in a program). For instance, an
+ * joinpoint (i.e. a location in a the program). For instance, an
 * invocation is the runtime joinpoint on a method (static joinpoint).
 * The static part of a given joinpoint can be generically retrieved
 * using the {@link #getStaticPart()} method.
@@ -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.
@@ -103,11 +103,10 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
 	@Override
 	public void validate(Class<?> aspectClass) throws AopConfigException {
 		// If the parent has the annotation and isn't abstract it's an error
-		Class<?> superclass = aspectClass.getSuperclass();
-		if (superclass.getAnnotation(Aspect.class) != null &&
-				!Modifier.isAbstract(superclass.getModifiers())) {
+		if (aspectClass.getSuperclass().getAnnotation(Aspect.class) != null &&
+				!Modifier.isAbstract(aspectClass.getSuperclass().getModifiers())) {
 			throw new AopConfigException("[" + aspectClass.getName() + "] cannot extend concrete aspect [" +
-					superclass.getName() + "]");
+					aspectClass.getSuperclass().getName() + "]");
 		}

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

@@ -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();
 			}
 		}
 	}
@@ -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;
@@ -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 "&amp;": e.g. "&amp;myFactoryBean".
+	 * including the factory-bean prefix "&": e.g. "&myFactoryBean".
 	 * @see org.springframework.beans.factory.FactoryBean
 	 * @see org.springframework.beans.factory.BeanFactory#FACTORY_BEAN_PREFIX
 	 */
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -125,8 +125,12 @@ public abstract class AbstractBeanFactoryBasedTargetSourceCreator
 	 */
 	protected DefaultListableBeanFactory getInternalBeanFactoryForBean(String beanName) {
 		synchronized (this.internalBeanFactories) {
-			return this.internalBeanFactories.computeIfAbsent(beanName,
-					name -> buildInternalBeanFactory(this.beanFactory));
+			DefaultListableBeanFactory internalBeanFactory = this.internalBeanFactories.get(beanName);
+			if (internalBeanFactory == null) {
+				internalBeanFactory = buildInternalBeanFactory(this.beanFactory);
+				this.internalBeanFactories.put(beanName, internalBeanFactory);
+			}
+			return internalBeanFactory;
 		}
 	}

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

 }
@@ -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");
 	}
-
 }
@@ -11,7 +11,7 @@ sourceSets.test.java.srcDirs = files()
 aspectj.version = dependencyManagement.managedVersions['org.aspectj:aspectjweaver']

 dependencies {
-	api("org.aspectj:aspectjweaver")
+	compile("org.aspectj:aspectjweaver")
 	compileOnly("org.aspectj:aspectjrt")
 	optional(project(":spring-aop"))  // for @Async support
 	optional(project(":spring-beans"))  // for @Configurable support
@@ -21,13 +21,13 @@ dependencies {
 	optional(project(":spring-tx"))  // for JPA, @Transactional support
 	optional("javax.cache:cache-api")  // for JCache aspect
 	optional("javax.transaction:javax.transaction-api")  // for @javax.transaction.Transactional support
-	testImplementation(project(":spring-core"))  // for CodeStyleAspect
-	testImplementation(project(":spring-test"))
-	testImplementation(testFixtures(project(":spring-context")))
-	testImplementation(testFixtures(project(":spring-context-support")))
-	testImplementation(testFixtures(project(":spring-core")))
-	testImplementation(testFixtures(project(":spring-tx")))
-	testImplementation("javax.mail:javax.mail-api")
+	testCompile(project(":spring-core"))  // for CodeStyleAspect
+	testCompile(project(":spring-test"))
+	testCompile(testFixtures(project(":spring-context")))
+	testCompile(testFixtures(project(":spring-context-support")))
+	testCompile(testFixtures(project(":spring-core")))
+	testCompile(testFixtures(project(":spring-tx")))
+	testCompile("javax.mail:javax.mail-api")
 	testCompileOnly("org.aspectj:aspectjrt")
 }

@@ -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 {
+
 }
@@ -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");
 	}

 }
@@ -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() {}
-
 }
@@ -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() {}
-
 }
@@ -4,14 +4,14 @@ apply plugin: "groovy"
 apply plugin: "kotlin"

 dependencies {
-	api(project(":spring-core"))
+	compile(project(":spring-core"))
 	optional("javax.inject:javax.inject")
 	optional("org.yaml:snakeyaml")
 	optional("org.codehaus.groovy:groovy-xml")
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
-	testImplementation(testFixtures(project(":spring-core")))
-	testImplementation("javax.annotation:javax.annotation-api")
+	testCompile(testFixtures(project(":spring-core")))
+	testCompile("javax.annotation:javax.annotation-api")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.assertj:assertj-core")
 }
@@ -87,10 +87,7 @@ public abstract class BeanUtils {
 		values.put(byte.class, (byte) 0);
 		values.put(short.class, (short) 0);
 		values.put(int.class, 0);
-		values.put(long.class, 0L);
-		values.put(float.class, 0F);
-		values.put(double.class, 0D);
-		values.put(char.class, '\0');
+		values.put(long.class, (long) 0);
 		DEFAULT_TYPE_VALUES = Collections.unmodifiableMap(values);
 	}

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

@@ -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.
@@ -351,9 +351,7 @@ public class ConstructorArgumentValues {
 	 * @return the ValueHolder for the argument, or {@code null} if none set
 	 */
 	@Nullable
-	public ValueHolder getArgumentValue(int index, @Nullable Class<?> requiredType,
-			@Nullable String requiredName, @Nullable Set<ValueHolder> usedValueHolders) {
-
+	public ValueHolder getArgumentValue(int index, @Nullable Class<?> requiredType, @Nullable String requiredName, @Nullable Set<ValueHolder> usedValueHolders) {
 		Assert.isTrue(index >= 0, "Index must not be negative");
 		ValueHolder valueHolder = getIndexedArgumentValue(index, requiredType, requiredName);
 		if (valueHolder == null) {
@@ -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
@@ -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
@@ -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:
@@ -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
@@ -75,18 +75,18 @@ import org.springframework.util.StringUtils;
 *
 * def reader = new GroovyBeanDefinitionReader(myApplicationContext)
 * reader.beans {
- *     dataSource(BasicDataSource) {                  // &lt;--- 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
 *         }
 *     }
@@ -246,15 +246,6 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		this.allowCircularReferences = allowCircularReferences;
 	}

-	/**
-	 * Return whether to allow circular references between beans.
-	 * @since 5.3.10
-	 * @see #setAllowCircularReferences
-	 */
-	public boolean isAllowCircularReferences() {
-		return this.allowCircularReferences;
-	}
-
 	/**
 	 * Set whether to allow the raw injection of a bean instance into some other
 	 * bean's property, despite the injected bean eventually getting wrapped
@@ -273,15 +264,6 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 		this.allowRawInjectionDespiteWrapping = allowRawInjectionDespiteWrapping;
 	}

-	/**
-	 * Return whether to allow the raw injection of a bean instance.
-	 * @since 5.3.10
-	 * @see #setAllowRawInjectionDespiteWrapping
-	 */
-	public boolean isAllowRawInjectionDespiteWrapping() {
-		return this.allowRawInjectionDespiteWrapping;
-	}
-
 	/**
 	 * Ignore the given dependency type for autowiring:
 	 * for example, String. Default is none.
@@ -1342,7 +1324,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 +1345,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(
@@ -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) {
@@ -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
 						}
 					}
 				}
@@ -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() {
@@ -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
@@ -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);
 	}

@@ -71,13 +71,13 @@ public class PluggableSchemaResolver implements EntityResolver {

 	private final String schemaMappingsLocation;

-	/** Stores the mapping of schema URL &rarr; 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)
@@ -49,7 +49,6 @@ import org.springframework.lang.Nullable;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.SoftAssertions.assertSoftly;

 /**
 * Unit tests for {@link BeanUtils}.
@@ -86,43 +85,19 @@ class BeanUtilsTests {
 	}

 	@Test  // gh-22531
-	void instantiateClassWithFewerArgsThanParameters() throws NoSuchMethodException {
-		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
-
-		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
-				BeanUtils.instantiateClass(constructor, null, null, "foo"));
+	void instantiateClassWithOptionalPrimitiveType() throws NoSuchMethodException {
+		Constructor<BeanWithPrimitiveTypes> ctor = BeanWithPrimitiveTypes.class.getDeclaredConstructor(int.class, boolean.class, String.class);
+		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(ctor, null, null, "foo");
+		assertThat(bean.getCounter()).isEqualTo(0);
+		assertThat(bean.isFlag()).isEqualTo(false);
+		assertThat(bean.getValue()).isEqualTo("foo");
 	}

 	@Test  // gh-22531
 	void instantiateClassWithMoreArgsThanParameters() throws NoSuchMethodException {
-		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
-
+		Constructor<BeanWithPrimitiveTypes> ctor = BeanWithPrimitiveTypes.class.getDeclaredConstructor(int.class, boolean.class, String.class);
 		assertThatExceptionOfType(BeanInstantiationException.class).isThrownBy(() ->
-				BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, null, "foo", null));
-	}
-
-	@Test  // gh-22531, gh-27390
-	void instantiateClassWithOptionalPrimitiveTypes() throws NoSuchMethodException {
-		Constructor<BeanWithPrimitiveTypes> constructor = getBeanWithPrimitiveTypesConstructor();
-
-		BeanWithPrimitiveTypes bean = BeanUtils.instantiateClass(constructor, null, null, null, null, null, null, null, null, "foo");
-
-		assertSoftly(softly -> {
-			softly.assertThat(bean.isFlag()).isFalse();
-			softly.assertThat(bean.getByteCount()).isEqualTo((byte) 0);
-			softly.assertThat(bean.getShortCount()).isEqualTo((short) 0);
-			softly.assertThat(bean.getIntCount()).isEqualTo(0);
-			softly.assertThat(bean.getLongCount()).isEqualTo(0L);
-			softly.assertThat(bean.getFloatCount()).isEqualTo(0F);
-			softly.assertThat(bean.getDoubleCount()).isEqualTo(0D);
-			softly.assertThat(bean.getCharacter()).isEqualTo('\0');
-			softly.assertThat(bean.getText()).isEqualTo("foo");
-		});
-	}
-
-	private Constructor<BeanWithPrimitiveTypes> getBeanWithPrimitiveTypesConstructor() throws NoSuchMethodException {
-		return BeanWithPrimitiveTypes.class.getConstructor(boolean.class, byte.class, short.class, int.class,
-				long.class, float.class, double.class, char.class, String.class);
+				BeanUtils.instantiateClass(ctor, null, null, "foo", null));
 	}

 	@Test
@@ -653,68 +628,30 @@ class BeanUtilsTests {

 	private static class BeanWithPrimitiveTypes {

-		private boolean flag;
-		private byte byteCount;
-		private short shortCount;
-		private int intCount;
-		private long longCount;
-		private float floatCount;
-		private double doubleCount;
-		private char character;
-		private String text;
+		private int counter;

+		private boolean flag;
+
+		private String value;

 		@SuppressWarnings("unused")
-		public BeanWithPrimitiveTypes(boolean flag, byte byteCount, short shortCount, int intCount, long longCount,
-				float floatCount, double doubleCount, char character, String text) {
-
+		public BeanWithPrimitiveTypes(int counter, boolean flag, String value) {
+			this.counter = counter;
 			this.flag = flag;
-			this.byteCount = byteCount;
-			this.shortCount = shortCount;
-			this.intCount = intCount;
-			this.longCount = longCount;
-			this.floatCount = floatCount;
-			this.doubleCount = doubleCount;
-			this.character = character;
-			this.text = text;
+			this.value = value;
+		}
+
+		public int getCounter() {
+			return counter;
 		}

 		public boolean isFlag() {
 			return flag;
 		}

-		public byte getByteCount() {
-			return byteCount;
+		public String getValue() {
+			return value;
 		}
-
-		public short getShortCount() {
-			return shortCount;
-		}
-
-		public int getIntCount() {
-			return intCount;
-		}
-
-		public long getLongCount() {
-			return longCount;
-		}
-
-		public float getFloatCount() {
-			return floatCount;
-		}
-
-		public double getDoubleCount() {
-			return doubleCount;
-		}
-
-		public char getCharacter() {
-			return character;
-		}
-
-		public String getText() {
-			return text;
-		}
-
 	}

 	private static class PrivateBeanWithPrivateConstructor {
@@ -38,7 +38,7 @@ public class BeanWrapperAutoGrowingTests {


 	@BeforeEach
-	public void setup() {
+	public void setUp() {
 		wrapper.setAutoGrowNestedPaths(true);
 	}

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

 package org.springframework.beans;

+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -45,10 +46,10 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 * @author Chris Beams
 * @since 18.01.2006
 */
-class BeanWrapperGenericsTests {
+public class BeanWrapperGenericsTests {

 	@Test
-	void testGenericSet() {
+	public void testGenericSet() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Set<String> input = new HashSet<>();
@@ -60,7 +61,7 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericLowerBoundedSet() {
+	public void testGenericLowerBoundedSet() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, true));
@@ -73,7 +74,7 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericSetWithConversionFailure() {
+	public void testGenericSetWithConversionFailure() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Set<TestBean> input = new HashSet<>();
@@ -84,7 +85,7 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericList() throws Exception {
+	public void testGenericList() throws MalformedURLException {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		List<String> input = new ArrayList<>();
@@ -96,7 +97,7 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericListElement() throws Exception {
+	public void testGenericListElement() throws MalformedURLException {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setResourceList(new ArrayList<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
@@ -105,29 +106,29 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericMap() {
+	public void testGenericMap() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Map<String, String> input = new HashMap<>();
 		input.put("4", "5");
 		input.put("6", "7");
 		bw.setPropertyValue("shortMap", input);
-		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
 	}

 	@Test
-	void testGenericMapElement() {
+	public void testGenericMapElement() {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setShortMap(new HashMap<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("shortMap[4]", "5");
 		assertThat(bw.getPropertyValue("shortMap[4]")).isEqualTo(5);
-		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
 	}

 	@Test
-	void testGenericMapWithKeyType() {
+	public void testGenericMapWithKeyType() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Map<String, String> input = new HashMap<>();
@@ -139,17 +140,17 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericMapElementWithKeyType() {
+	public void testGenericMapElementWithKeyType() {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setLongMap(new HashMap<Long, Integer>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("longMap[4]", "5");
-		assertThat(gb.getLongMap().get(Long.valueOf("4"))).isEqualTo("5");
+		assertThat(gb.getLongMap().get(new Long("4"))).isEqualTo("5");
 		assertThat(bw.getPropertyValue("longMap[4]")).isEqualTo("5");
 	}

 	@Test
-	void testGenericMapWithCollectionValue() {
+	public void testGenericMapWithCollectionValue() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.registerCustomEditor(Number.class, new CustomNumberEditor(Integer.class, false));
@@ -161,12 +162,14 @@ class BeanWrapperGenericsTests {
 		value2.add(Boolean.TRUE);
 		input.put("2", value2);
 		bw.setPropertyValue("collectionMap", input);
-		assertThat(gb.getCollectionMap().get(1) instanceof HashSet).isTrue();
-		assertThat(gb.getCollectionMap().get(2) instanceof ArrayList).isTrue();
+		boolean condition1 = gb.getCollectionMap().get(1) instanceof HashSet;
+		assertThat(condition1).isTrue();
+		boolean condition = gb.getCollectionMap().get(2) instanceof ArrayList;
+		assertThat(condition).isTrue();
 	}

 	@Test
-	void testGenericMapElementWithCollectionValue() {
+	public void testGenericMapElementWithCollectionValue() {
 		GenericBean<?> gb = new GenericBean<>();
 		gb.setCollectionMap(new HashMap<>());
 		BeanWrapper bw = new BeanWrapperImpl(gb);
@@ -174,23 +177,24 @@ class BeanWrapperGenericsTests {
 		HashSet<Integer> value1 = new HashSet<>();
 		value1.add(1);
 		bw.setPropertyValue("collectionMap[1]", value1);
-		assertThat(gb.getCollectionMap().get(1) instanceof HashSet).isTrue();
+		boolean condition = gb.getCollectionMap().get(1) instanceof HashSet;
+		assertThat(condition).isTrue();
 	}

 	@Test
-	void testGenericMapFromProperties() {
+	public void testGenericMapFromProperties() {
 		GenericBean<?> gb = new GenericBean<>();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		Properties input = new Properties();
 		input.setProperty("4", "5");
 		input.setProperty("6", "7");
 		bw.setPropertyValue("shortMap", input);
-		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
 	}

 	@Test
-	void testGenericListOfLists() {
+	public void testGenericListOfLists() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		List<List<Integer>> list = new ArrayList<>();
 		list.add(new ArrayList<>());
@@ -202,7 +206,7 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericListOfListsWithElementConversion() {
+	public void testGenericListOfListsWithElementConversion() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		List<List<Integer>> list = new ArrayList<>();
 		list.add(new ArrayList<>());
@@ -214,7 +218,7 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericListOfArrays() {
+	public void testGenericListOfArrays() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		ArrayList<String[]> list = new ArrayList<>();
 		list.add(new String[] {"str1", "str2"});
@@ -226,7 +230,7 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericListOfArraysWithElementConversion() {
+	public void testGenericListOfArraysWithElementConversion() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		ArrayList<String[]> list = new ArrayList<>();
 		list.add(new String[] {"str1", "str2"});
@@ -239,55 +243,55 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericListOfMaps() {
+	public void testGenericListOfMaps() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		List<Map<Integer, Long>> list = new ArrayList<>();
 		list.add(new HashMap<>());
 		gb.setListOfMaps(list);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
-		bw.setPropertyValue("listOfMaps[0][10]", 5L);
-		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(5L);
-		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(Long.valueOf(5));
+		bw.setPropertyValue("listOfMaps[0][10]", new Long(5));
+		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(new Long(5));
+		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(new Long(5));
 	}

 	@Test
-	void testGenericListOfMapsWithElementConversion() {
+	public void testGenericListOfMapsWithElementConversion() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		List<Map<Integer, Long>> list = new ArrayList<>();
 		list.add(new HashMap<>());
 		gb.setListOfMaps(list);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("listOfMaps[0][10]", "5");
-		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(5L);
-		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(Long.valueOf(5));
+		assertThat(bw.getPropertyValue("listOfMaps[0][10]")).isEqualTo(new Long(5));
+		assertThat(gb.getListOfMaps().get(0).get(10)).isEqualTo(new Long(5));
 	}

 	@Test
-	void testGenericMapOfMaps() {
+	public void testGenericMapOfMaps() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<String, Map<Integer, Long>> map = new HashMap<>();
 		map.put("mykey", new HashMap<>());
 		gb.setMapOfMaps(map);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
-		bw.setPropertyValue("mapOfMaps[mykey][10]", 5L);
-		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(5L);
-		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(Long.valueOf(5));
+		bw.setPropertyValue("mapOfMaps[mykey][10]", new Long(5));
+		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(new Long(5));
+		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(new Long(5));
 	}

 	@Test
-	void testGenericMapOfMapsWithElementConversion() {
+	public void testGenericMapOfMapsWithElementConversion() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<String, Map<Integer, Long>> map = new HashMap<>();
 		map.put("mykey", new HashMap<>());
 		gb.setMapOfMaps(map);
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("mapOfMaps[mykey][10]", "5");
-		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(Long.valueOf(5));
-		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(Long.valueOf(5));
+		assertThat(bw.getPropertyValue("mapOfMaps[mykey][10]")).isEqualTo(new Long(5));
+		assertThat(gb.getMapOfMaps().get("mykey").get(10)).isEqualTo(new Long(5));
 	}

 	@Test
-	void testGenericMapOfLists() {
+	public void testGenericMapOfLists() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<Integer, List<Integer>> map = new HashMap<>();
 		map.put(1, new ArrayList<>());
@@ -299,7 +303,7 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericMapOfListsWithElementConversion() {
+	public void testGenericMapOfListsWithElementConversion() throws MalformedURLException {
 		GenericBean<String> gb = new GenericBean<>();
 		Map<Integer, List<Integer>> map = new HashMap<>();
 		map.put(1, new ArrayList<>());
@@ -311,7 +315,7 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericTypeNestingMapOfInteger() {
+	public void testGenericTypeNestingMapOfInteger() throws Exception {
 		Map<String, String> map = new HashMap<>();
 		map.put("testKey", "100");

@@ -320,13 +324,14 @@ class BeanWrapperGenericsTests {
 		bw.setPropertyValue("mapOfInteger", map);

 		Object obj = gb.getMapOfInteger().get("testKey");
-		assertThat(obj instanceof Integer).isTrue();
+		boolean condition = obj instanceof Integer;
+		assertThat(condition).isTrue();
 	}

 	@Test
-	void testGenericTypeNestingMapOfListOfInteger() {
+	public void testGenericTypeNestingMapOfListOfInteger() throws Exception {
 		Map<String, List<String>> map = new HashMap<>();
-		List<String> list = Arrays.asList("1", "2", "3");
+		List<String> list = Arrays.asList(new String[] {"1", "2", "3"});
 		map.put("testKey", list);

 		NestedGenericCollectionBean gb = new NestedGenericCollectionBean();
@@ -334,12 +339,13 @@ class BeanWrapperGenericsTests {
 		bw.setPropertyValue("mapOfListOfInteger", map);

 		Object obj = gb.getMapOfListOfInteger().get("testKey").get(0);
-		assertThat(obj instanceof Integer).isTrue();
+		boolean condition = obj instanceof Integer;
+		assertThat(condition).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(1);
 	}

 	@Test
-	void testGenericTypeNestingListOfMapOfInteger() {
+	public void testGenericTypeNestingListOfMapOfInteger() throws Exception {
 		List<Map<String, String>> list = new ArrayList<>();
 		Map<String, String> map = new HashMap<>();
 		map.put("testKey", "5");
@@ -350,14 +356,15 @@ class BeanWrapperGenericsTests {
 		bw.setPropertyValue("listOfMapOfInteger", list);

 		Object obj = gb.getListOfMapOfInteger().get(0).get("testKey");
-		assertThat(obj instanceof Integer).isTrue();
+		boolean condition = obj instanceof Integer;
+		assertThat(condition).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(5);
 	}

 	@Test
-	void testGenericTypeNestingMapOfListOfListOfInteger() {
+	public void testGenericTypeNestingMapOfListOfListOfInteger() throws Exception {
 		Map<String, List<List<String>>> map = new HashMap<>();
-		List<String> list = Arrays.asList("1", "2", "3");
+		List<String> list = Arrays.asList(new String[] {"1", "2", "3"});
 		map.put("testKey", Collections.singletonList(list));

 		NestedGenericCollectionBean gb = new NestedGenericCollectionBean();
@@ -365,12 +372,13 @@ class BeanWrapperGenericsTests {
 		bw.setPropertyValue("mapOfListOfListOfInteger", map);

 		Object obj = gb.getMapOfListOfListOfInteger().get("testKey").get(0).get(0);
-		assertThat(obj instanceof Integer).isTrue();
+		boolean condition = obj instanceof Integer;
+		assertThat(condition).isTrue();
 		assertThat(((Integer) obj).intValue()).isEqualTo(1);
 	}

 	@Test
-	void testComplexGenericMap() {
+	public void testComplexGenericMap() {
 		Map<List<String>, List<String>> inputMap = new HashMap<>();
 		List<String> inputKey = new ArrayList<>();
 		inputKey.add("1");
@@ -383,11 +391,11 @@ class BeanWrapperGenericsTests {
 		bw.setPropertyValue("genericMap", inputMap);

 		assertThat(holder.getGenericMap().keySet().iterator().next().get(0)).isEqualTo(1);
-		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
+		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
 	}

 	@Test
-	void testComplexGenericMapWithCollectionConversion() {
+	public void testComplexGenericMapWithCollectionConversion() {
 		Map<Set<String>, Set<String>> inputMap = new HashMap<>();
 		Set<String> inputKey = new HashSet<>();
 		inputKey.add("1");
@@ -400,11 +408,11 @@ class BeanWrapperGenericsTests {
 		bw.setPropertyValue("genericMap", inputMap);

 		assertThat(holder.getGenericMap().keySet().iterator().next().get(0)).isEqualTo(1);
-		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
+		assertThat(holder.getGenericMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
 	}

 	@Test
-	void testComplexGenericIndexedMapEntry() {
+	public void testComplexGenericIndexedMapEntry() {
 		List<String> inputValue = new ArrayList<>();
 		inputValue.add("10");

@@ -413,11 +421,11 @@ class BeanWrapperGenericsTests {
 		bw.setPropertyValue("genericIndexedMap[1]", inputValue);

 		assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
+		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
 	}

 	@Test
-	void testComplexGenericIndexedMapEntryWithCollectionConversion() {
+	public void testComplexGenericIndexedMapEntryWithCollectionConversion() {
 		Set<String> inputValue = new HashSet<>();
 		inputValue.add("10");

@@ -426,11 +434,11 @@ class BeanWrapperGenericsTests {
 		bw.setPropertyValue("genericIndexedMap[1]", inputValue);

 		assertThat(holder.getGenericIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
+		assertThat(holder.getGenericIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
 	}

 	@Test
-	void testComplexDerivedIndexedMapEntry() {
+	public void testComplexDerivedIndexedMapEntry() {
 		List<String> inputValue = new ArrayList<>();
 		inputValue.add("10");

@@ -439,11 +447,11 @@ class BeanWrapperGenericsTests {
 		bw.setPropertyValue("derivedIndexedMap[1]", inputValue);

 		assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
+		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
 	}

 	@Test
-	void testComplexDerivedIndexedMapEntryWithCollectionConversion() {
+	public void testComplexDerivedIndexedMapEntryWithCollectionConversion() {
 		Set<String> inputValue = new HashSet<>();
 		inputValue.add("10");

@@ -452,11 +460,11 @@ class BeanWrapperGenericsTests {
 		bw.setPropertyValue("derivedIndexedMap[1]", inputValue);

 		assertThat(holder.getDerivedIndexedMap().keySet().iterator().next()).isEqualTo(1);
-		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(Long.valueOf(10));
+		assertThat(holder.getDerivedIndexedMap().values().iterator().next().get(0)).isEqualTo(new Long(10));
 	}

 	@Test
-	void testGenericallyTypedIntegerBean() {
+	public void testGenericallyTypedIntegerBean() throws Exception {
 		GenericIntegerBean gb = new GenericIntegerBean();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("genericProperty", "10");
@@ -467,7 +475,7 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testGenericallyTypedSetOfIntegerBean() {
+	public void testGenericallyTypedSetOfIntegerBean() throws Exception {
 		GenericSetOfIntegerBean gb = new GenericSetOfIntegerBean();
 		BeanWrapper bw = new BeanWrapperImpl(gb);
 		bw.setPropertyValue("genericProperty", "10");
@@ -478,23 +486,23 @@ class BeanWrapperGenericsTests {
 	}

 	@Test
-	void testSettingGenericPropertyWithReadOnlyInterface() {
+	public void testSettingGenericPropertyWithReadOnlyInterface() {
 		Bar bar = new Bar();
 		BeanWrapper bw = new BeanWrapperImpl(bar);
 		bw.setPropertyValue("version", "10");
-		assertThat(bar.getVersion()).isEqualTo(Double.valueOf(10.0));
+		assertThat(bar.getVersion()).isEqualTo(new Double(10.0));
 	}

 	@Test
-	void testSettingLongPropertyWithGenericInterface() {
+	public void testSettingLongPropertyWithGenericInterface() {
 		Promotion bean = new Promotion();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.setPropertyValue("id", "10");
-		assertThat(bean.getId()).isEqualTo(Long.valueOf(10));
+		assertThat(bean.getId()).isEqualTo(new Long(10));
 	}

 	@Test
-	void testUntypedPropertyWithMapAtRuntime() {
+	public void testUntypedPropertyWithMapAtRuntime() {
 		class Holder<D> {
 			private final D data;
 			public Holder(D data) {
@@ -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,7 +26,6 @@ import org.springframework.beans.testfixture.beans.TestBean;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.assertThatNoException;

 /**
 * Specific {@link BeanWrapperImpl} tests.
@@ -38,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThatNoException;
 * @author Chris Beams
 * @author Dave Syer
 */
-class BeanWrapperTests extends AbstractPropertyAccessorTests {
+public class BeanWrapperTests extends AbstractPropertyAccessorTests {

 	@Override
 	protected BeanWrapperImpl createAccessor(Object target) {
@@ -47,7 +46,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {


 	@Test
-	void setterDoesNotCallGetter() {
+	public void setterDoesNotCallGetter() {
 		GetterBean target = new GetterBean();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setPropertyValue("name", "tom");
@@ -56,7 +55,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}

 	@Test
-	void getterSilentlyFailWithOldValueExtraction() {
+	public void getterSilentlyFailWithOldValueExtraction() {
 		GetterBean target = new GetterBean();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setExtractOldValueForEditor(true); // This will call the getter
@@ -66,7 +65,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}

 	@Test
-	void aliasedSetterThroughDefaultMethod() {
+	public void aliasedSetterThroughDefaultMethod() {
 		GetterBean target = new GetterBean();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setPropertyValue("aliasedName", "tom");
@@ -75,7 +74,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}

 	@Test
-	void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() {
+	public void setValidAndInvalidPropertyValuesShouldContainExceptionDetails() {
 		TestBean target = new TestBean();
 		String newName = "tony";
 		String invalidTouchy = ".valid";
@@ -92,12 +91,12 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 						.getNewValue()).isEqualTo(invalidTouchy);
 			});
 		// Test validly set property matches
-		assertThat(target.getName()).as("Valid set property must stick").isEqualTo(newName);
-		assertThat(target.getAge()).as("Invalid set property must retain old value").isEqualTo(0);
+		assertThat(target.getName().equals(newName)).as("Valid set property must stick").isTrue();
+		assertThat(target.getAge() == 0).as("Invalid set property must retain old value").isTrue();
 	}

 	@Test
-	void checkNotWritablePropertyHoldPossibleMatches() {
+	public void checkNotWritablePropertyHoldPossibleMatches() {
 		TestBean target = new TestBean();
 		BeanWrapper accessor = createAccessor(target);
 		assertThatExceptionOfType(NotWritablePropertyException.class).isThrownBy(() ->
@@ -106,15 +105,15 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}

 	@Test // Can't be shared; there is no such thing as a read-only field
-	void setReadOnlyMapProperty() {
+	public void setReadOnlyMapProperty() {
 		TypedReadOnlyMap map = new TypedReadOnlyMap(Collections.singletonMap("key", new TestBean()));
 		TypedReadOnlyMapClient target = new TypedReadOnlyMapClient();
 		BeanWrapper accessor = createAccessor(target);
-		assertThatNoException().isThrownBy(() -> accessor.setPropertyValue("map", map));
+		accessor.setPropertyValue("map", map);
 	}

 	@Test
-	void notWritablePropertyExceptionContainsAlternativeMatch() {
+	public void notWritablePropertyExceptionContainsAlternativeMatch() {
 		IntelliBean target = new IntelliBean();
 		BeanWrapper bw = createAccessor(target);
 		try {
@@ -122,12 +121,12 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 		}
 		catch (NotWritablePropertyException ex) {
 			assertThat(ex.getPossibleMatches()).as("Possible matches not determined").isNotNull();
-			assertThat(ex.getPossibleMatches()).as("Invalid amount of alternatives").hasSize(1);
+			assertThat(ex.getPossibleMatches().length).as("Invalid amount of alternatives").isEqualTo(1);
 		}
 	}

 	@Test
-	void notWritablePropertyExceptionContainsAlternativeMatches() {
+	public void notWritablePropertyExceptionContainsAlternativeMatches() {
 		IntelliBean target = new IntelliBean();
 		BeanWrapper bw = createAccessor(target);
 		try {
@@ -135,23 +134,23 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 		}
 		catch (NotWritablePropertyException ex) {
 			assertThat(ex.getPossibleMatches()).as("Possible matches not determined").isNotNull();
-			assertThat(ex.getPossibleMatches()).as("Invalid amount of alternatives").hasSize(3);
+			assertThat(ex.getPossibleMatches().length).as("Invalid amount of alternatives").isEqualTo(3);
 		}
 	}

 	@Override
 	@Test  // Can't be shared: no type mismatch with a field
-	void setPropertyTypeMismatch() {
+	public void setPropertyTypeMismatch() {
 		PropertyTypeMismatch target = new PropertyTypeMismatch();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setPropertyValue("object", "a String");
 		assertThat(target.value).isEqualTo("a String");
-		assertThat(target.getObject()).isEqualTo(8);
+		assertThat(target.getObject() == 8).isTrue();
 		assertThat(accessor.getPropertyValue("object")).isEqualTo(8);
 	}

 	@Test
-	void propertyDescriptors() {
+	public void propertyDescriptors() {
 		TestBean target = new TestBean();
 		target.setSpouse(new TestBean());
 		BeanWrapper accessor = createAccessor(target);
@@ -167,7 +166,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {

 	@Test
 	@SuppressWarnings("unchecked")
-	void getPropertyWithOptional() {
+	public void getPropertyWithOptional() {
 		GetterWithOptional target = new GetterWithOptional();
 		TestBean tb = new TestBean("x");
 		BeanWrapper accessor = createAccessor(target);
@@ -190,7 +189,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}

 	@Test
-	void getPropertyWithOptionalAndAutoGrow() {
+	public void getPropertyWithOptionalAndAutoGrow() {
 		GetterWithOptional target = new GetterWithOptional();
 		BeanWrapper accessor = createAccessor(target);
 		accessor.setAutoGrowNestedPaths(true);
@@ -202,7 +201,7 @@ class BeanWrapperTests extends AbstractPropertyAccessorTests {
 	}

 	@Test
-	void incompletelyQuotedKeyLeadsToPropertyException() {
+	public void incompletelyQuotedKeyLeadsToPropertyException() {
 		TestBean target = new TestBean();
 		BeanWrapper accessor = createAccessor(target);
 		assertThatExceptionOfType(NotWritablePropertyException.class).isThrownBy(() ->
@@ -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.
@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Chris Beams
 * @author Stephane Nicoll
 */
-class DirectFieldAccessorTests extends AbstractPropertyAccessorTests {
+public class DirectFieldAccessorTests extends AbstractPropertyAccessorTests {

 	@Override
 	protected DirectFieldAccessor createAccessor(Object target) {
@@ -38,7 +38,7 @@ class DirectFieldAccessorTests extends AbstractPropertyAccessorTests {


 	@Test
-	void withShadowedField() {
+	public void withShadowedField() {
 		final StringBuilder sb = new StringBuilder();

 		TestBean target = new TestBean() {
@@ -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.
@@ -182,9 +182,9 @@ class DefaultListableBeanFactoryTests {

 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames).hasSize(0);
+		assertThat(beanNames.length).isEqualTo(0);
 		beanNames = lbf.getBeanNamesForAnnotation(SuppressWarnings.class);
-		assertThat(beanNames).hasSize(0);
+		assertThat(beanNames.length).isEqualTo(0);

 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -216,9 +216,9 @@ class DefaultListableBeanFactoryTests {

 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames).hasSize(0);
+		assertThat(beanNames.length).isEqualTo(0);
 		beanNames = lbf.getBeanNamesForAnnotation(SuppressWarnings.class);
-		assertThat(beanNames).hasSize(0);
+		assertThat(beanNames.length).isEqualTo(0);

 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -249,9 +249,9 @@ class DefaultListableBeanFactoryTests {

 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames).hasSize(0);
+		assertThat(beanNames.length).isEqualTo(0);
 		beanNames = lbf.getBeanNamesForAnnotation(SuppressWarnings.class);
-		assertThat(beanNames).hasSize(0);
+		assertThat(beanNames.length).isEqualTo(0);

 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -283,7 +283,7 @@ class DefaultListableBeanFactoryTests {

 		assertThat(!DummyFactory.wasPrototypeCreated()).as("prototype not instantiated").isTrue();
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames).hasSize(1);
+		assertThat(beanNames.length).isEqualTo(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isTrue();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -337,7 +337,7 @@ class DefaultListableBeanFactoryTests {

 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames).hasSize(1);
+		assertThat(beanNames.length).isEqualTo(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -349,7 +349,7 @@ class DefaultListableBeanFactoryTests {
 		assertThat(lbf.isTypeMatch("x1", TestBean.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x1", TestBean.class)).isFalse();
 		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isNull();
+		assertThat(lbf.getType("&x1")).isEqualTo(null);
 		assertThat(TestBeanFactory.initialized).isFalse();
 	}

@@ -362,7 +362,7 @@ class DefaultListableBeanFactoryTests {

 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames).hasSize(1);
+		assertThat(beanNames.length).isEqualTo(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -374,7 +374,7 @@ class DefaultListableBeanFactoryTests {
 		assertThat(lbf.isTypeMatch("x1", TestBean.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x1", TestBean.class)).isFalse();
 		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isNull();
+		assertThat(lbf.getType("&x1")).isEqualTo(null);
 		assertThat(TestBeanFactory.initialized).isFalse();
 	}

@@ -389,7 +389,7 @@ class DefaultListableBeanFactoryTests {

 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames).hasSize(1);
+		assertThat(beanNames.length).isEqualTo(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -401,7 +401,7 @@ class DefaultListableBeanFactoryTests {
 		assertThat(lbf.isTypeMatch("x1", TestBean.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x1", TestBean.class)).isFalse();
 		assertThat(lbf.getType("x1")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x1")).isNull();
+		assertThat(lbf.getType("&x1")).isEqualTo(null);
 		assertThat(TestBeanFactory.initialized).isFalse();
 	}

@@ -417,7 +417,7 @@ class DefaultListableBeanFactoryTests {

 		TestBeanFactory.initialized = false;
 		String[] beanNames = lbf.getBeanNamesForType(TestBean.class, true, false);
-		assertThat(beanNames).hasSize(1);
+		assertThat(beanNames.length).isEqualTo(1);
 		assertThat(beanNames[0]).isEqualTo("x1");
 		assertThat(lbf.containsSingleton("x1")).isFalse();
 		assertThat(lbf.containsBean("x1")).isTrue();
@@ -450,7 +450,7 @@ class DefaultListableBeanFactoryTests {
 		assertThat(lbf.isTypeMatch("x2", Object.class)).isTrue();
 		assertThat(lbf.isTypeMatch("&x2", Object.class)).isFalse();
 		assertThat(lbf.getType("x2")).isEqualTo(TestBean.class);
-		assertThat(lbf.getType("&x2")).isNull();
+		assertThat(lbf.getType("&x2")).isEqualTo(null);
 		assertThat(lbf.getAliases("x1").length).isEqualTo(1);
 		assertThat(lbf.getAliases("x1")[0]).isEqualTo("x2");
 		assertThat(lbf.getAliases("&x1").length).isEqualTo(1);
@@ -3030,7 +3030,7 @@ class DefaultListableBeanFactoryTests {
 		public Object convertIfNecessary(Object value, @Nullable Class requiredType) {
 			if (value instanceof String && Float.class.isAssignableFrom(requiredType)) {
 				try {
-					return this.numberFormat.parse((String) value).floatValue();
+					return new Float(this.numberFormat.parse((String) value).floatValue());
 				}
 				catch (ParseException ex) {
 					throw new TypeMismatchException(value, requiredType, ex);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -64,10 +64,10 @@ import static org.springframework.core.testfixture.TestGroup.LONG_RUNNING;
 * @author Sam Brannen
 * @since 20.01.2006
 */
-class BeanFactoryGenericsTests {
+public class BeanFactoryGenericsTests {

 	@Test
-	void testGenericSetProperty() {
+	public void testGenericSetProperty() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

@@ -84,7 +84,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericListProperty() throws Exception {
+	public void testGenericListProperty() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

@@ -101,7 +101,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericListPropertyWithAutowiring() throws Exception {
+	public void testGenericListPropertyWithAutowiring() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.registerSingleton("resource1", new UrlResource("http://localhost:8080"));
 		bf.registerSingleton("resource2", new UrlResource("http://localhost:9090"));
@@ -116,7 +116,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericListPropertyWithInvalidElementType() {
+	public void testGenericListPropertyWithInvalidElementType() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericIntegerBean.class);

@@ -134,7 +134,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericListPropertyWithOptionalAutowiring() {
+	public void testGenericListPropertyWithOptionalAutowiring() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();

 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
@@ -146,7 +146,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericMapProperty() {
+	public void testGenericMapProperty() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

@@ -158,12 +158,12 @@ class BeanFactoryGenericsTests {
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");

-		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
 	}

 	@Test
-	void testGenericListOfArraysProperty() {
+	public void testGenericListOfArraysProperty() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -171,14 +171,14 @@ class BeanFactoryGenericsTests {

 		assertThat(gb.getListOfArrays().size()).isEqualTo(1);
 		String[] array = gb.getListOfArrays().get(0);
-		assertThat(array).hasSize(2);
+		assertThat(array.length).isEqualTo(2);
 		assertThat(array[0]).isEqualTo("value1");
 		assertThat(array[1]).isEqualTo("value2");
 	}


 	@Test
-	void testGenericSetConstructor() {
+	public void testGenericSetConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

@@ -195,7 +195,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericSetConstructorWithAutowiring() {
+	public void testGenericSetConstructorWithAutowiring() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.registerSingleton("integer1", 4);
 		bf.registerSingleton("integer2", 5);
@@ -210,7 +210,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericSetConstructorWithOptionalAutowiring() {
+	public void testGenericSetConstructorWithOptionalAutowiring() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();

 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
@@ -222,7 +222,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericSetListConstructor() throws Exception {
+	public void testGenericSetListConstructor() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

@@ -245,7 +245,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericSetListConstructorWithAutowiring() throws Exception {
+	public void testGenericSetListConstructorWithAutowiring() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.registerSingleton("integer1", 4);
 		bf.registerSingleton("integer2", 5);
@@ -264,7 +264,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericSetListConstructorWithOptionalAutowiring() throws Exception {
+	public void testGenericSetListConstructorWithOptionalAutowiring() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.registerSingleton("resource1", new UrlResource("http://localhost:8080"));
 		bf.registerSingleton("resource2", new UrlResource("http://localhost:9090"));
@@ -279,7 +279,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericSetMapConstructor() {
+	public void testGenericSetMapConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

@@ -297,12 +297,12 @@ class BeanFactoryGenericsTests {

 		assertThat(gb.getIntegerSet().contains(4)).isTrue();
 		assertThat(gb.getIntegerSet().contains(5)).isTrue();
-		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
 	}

 	@Test
-	void testGenericMapResourceConstructor() throws Exception {
+	public void testGenericMapResourceConstructor() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

@@ -315,13 +315,13 @@ class BeanFactoryGenericsTests {
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");

-		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
 		assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
 	}

 	@Test
-	void testGenericMapMapConstructor() {
+	public void testGenericMapMapConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

@@ -338,16 +338,16 @@ class BeanFactoryGenericsTests {
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");

 		assertThat(gb.getShortMap()).isNotSameAs(gb.getPlainMap());
-		assertThat(gb.getPlainMap()).hasSize(2);
+		assertThat(gb.getPlainMap().size()).isEqualTo(2);
 		assertThat(gb.getPlainMap().get("1")).isEqualTo("0");
 		assertThat(gb.getPlainMap().get("2")).isEqualTo("3");
 		assertThat(gb.getShortMap().size()).isEqualTo(2);
-		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
 	}

 	@Test
-	void testGenericMapMapConstructorWithSameRefAndConversion() {
+	public void testGenericMapMapConstructorWithSameRefAndConversion() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

@@ -361,22 +361,22 @@ class BeanFactoryGenericsTests {
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");

 		assertThat(gb.getShortMap()).isNotSameAs(gb.getPlainMap());
-		assertThat(gb.getPlainMap()).hasSize(2);
+		assertThat(gb.getPlainMap().size()).isEqualTo(2);
 		assertThat(gb.getPlainMap().get("1")).isEqualTo("0");
 		assertThat(gb.getPlainMap().get("2")).isEqualTo("3");
 		assertThat(gb.getShortMap().size()).isEqualTo(2);
-		assertThat(gb.getShortMap().get(Short.valueOf("1"))).isEqualTo(0);
-		assertThat(gb.getShortMap().get(Short.valueOf("2"))).isEqualTo(3);
+		assertThat(gb.getShortMap().get(new Short("1"))).isEqualTo(0);
+		assertThat(gb.getShortMap().get(new Short("2"))).isEqualTo(3);
 	}

 	@Test
-	void testGenericMapMapConstructorWithSameRefAndNoConversion() {
+	public void testGenericMapMapConstructorWithSameRefAndNoConversion() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

 		Map<Short, Integer> input = new HashMap<>();
-		input.put((short) 1, 0);
-		input.put((short) 2, 3);
+		input.put(new Short((short) 1), 0);
+		input.put(new Short((short) 2), 3);
 		rbd.getConstructorArgumentValues().addGenericArgumentValue(input);
 		rbd.getConstructorArgumentValues().addGenericArgumentValue(input);

@@ -384,13 +384,13 @@ class BeanFactoryGenericsTests {
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");

 		assertThat(gb.getShortMap()).isSameAs(gb.getPlainMap());
-		assertThat(gb.getShortMap()).hasSize(2);
-		assertThat(gb.getShortMap().get(Short.valueOf("1"))).isEqualTo(0);
-		assertThat(gb.getShortMap().get(Short.valueOf("2"))).isEqualTo(3);
+		assertThat(gb.getShortMap().size()).isEqualTo(2);
+		assertThat(gb.getShortMap().get(new Short("1"))).isEqualTo(0);
+		assertThat(gb.getShortMap().get(new Short("2"))).isEqualTo(3);
 	}

 	@Test
-	void testGenericMapWithKeyTypeConstructor() {
+	public void testGenericMapWithKeyTypeConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);

@@ -407,7 +407,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericMapWithCollectionValueConstructor() {
+	public void testGenericMapWithCollectionValueConstructor() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
 			@Override
@@ -438,7 +438,7 @@ class BeanFactoryGenericsTests {


 	@Test
-	void testGenericSetFactoryMethod() {
+	public void testGenericSetFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -456,7 +456,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericSetListFactoryMethod() throws Exception {
+	public void testGenericSetListFactoryMethod() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -480,7 +480,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericSetMapFactoryMethod() {
+	public void testGenericSetMapFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -499,12 +499,12 @@ class BeanFactoryGenericsTests {

 		assertThat(gb.getIntegerSet().contains(4)).isTrue();
 		assertThat(gb.getIntegerSet().contains(5)).isTrue();
-		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
 	}

 	@Test
-	void testGenericMapResourceFactoryMethod() throws Exception {
+	public void testGenericMapResourceFactoryMethod() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -518,13 +518,13 @@ class BeanFactoryGenericsTests {
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");

-		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
 		assertThat(gb.getResourceList().get(0)).isEqualTo(new UrlResource("http://localhost:8080"));
 	}

 	@Test
-	void testGenericMapMapFactoryMethod() {
+	public void testGenericMapMapFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -543,12 +543,12 @@ class BeanFactoryGenericsTests {

 		assertThat(gb.getPlainMap().get("1")).isEqualTo("0");
 		assertThat(gb.getPlainMap().get("2")).isEqualTo("3");
-		assertThat(gb.getShortMap().get(Short.valueOf("4"))).isEqualTo(5);
-		assertThat(gb.getShortMap().get(Short.valueOf("6"))).isEqualTo(7);
+		assertThat(gb.getShortMap().get(new Short("4"))).isEqualTo(5);
+		assertThat(gb.getShortMap().get(new Short("6"))).isEqualTo(7);
 	}

 	@Test
-	void testGenericMapWithKeyTypeFactoryMethod() {
+	public void testGenericMapWithKeyTypeFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		RootBeanDefinition rbd = new RootBeanDefinition(GenericBean.class);
 		rbd.setFactoryMethodName("createInstance");
@@ -561,12 +561,12 @@ class BeanFactoryGenericsTests {
 		bf.registerBeanDefinition("genericBean", rbd);
 		GenericBean<?> gb = (GenericBean<?>) bf.getBean("genericBean");

-		assertThat(gb.getLongMap().get(Long.valueOf("4"))).isEqualTo("5");
-		assertThat(gb.getLongMap().get(Long.valueOf("6"))).isEqualTo("7");
+		assertThat(gb.getLongMap().get(new Long("4"))).isEqualTo("5");
+		assertThat(gb.getLongMap().get(new Long("6"))).isEqualTo("7");
 	}

 	@Test
-	void testGenericMapWithCollectionValueFactoryMethod() {
+	public void testGenericMapWithCollectionValueFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.addPropertyEditorRegistrar(new PropertyEditorRegistrar() {
 			@Override
@@ -597,7 +597,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericListBean() throws Exception {
+	public void testGenericListBean() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -607,7 +607,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericSetBean() throws Exception {
+	public void testGenericSetBean() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -617,18 +617,18 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericMapBean() throws Exception {
+	public void testGenericMapBean() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
 		Map<?, ?> map = (Map<?, ?>) bf.getBean("map");
-		assertThat(map).hasSize(1);
+		assertThat(map.size()).isEqualTo(1);
 		assertThat(map.keySet().iterator().next()).isEqualTo(10);
 		assertThat(map.values().iterator().next()).isEqualTo(new URL("http://localhost:8080"));
 	}

 	@Test
-	void testGenericallyTypedIntegerBean() {
+	public void testGenericallyTypedIntegerBean() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -639,7 +639,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericallyTypedSetOfIntegerBean() {
+	public void testGenericallyTypedSetOfIntegerBean() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -651,7 +651,7 @@ class BeanFactoryGenericsTests {

 	@Test
 	@EnabledForTestGroups(LONG_RUNNING)
-	void testSetBean() throws Exception {
+	public void testSetBean() throws Exception {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		new XmlBeanDefinitionReader(bf).loadBeanDefinitions(
 				new ClassPathResource("genericBeanTests.xml", getClass()));
@@ -671,7 +671,7 @@ class BeanFactoryGenericsTests {
 	 * <p>See SPR-9493
 	 */
 	@Test
-	void parameterizedStaticFactoryMethod() {
+	public void parameterizedStaticFactoryMethod() {
 		RootBeanDefinition rbd = new RootBeanDefinition(Mockito.class);
 		rbd.setFactoryMethodName("mock");
 		rbd.getConstructorArgumentValues().addGenericArgumentValue(Runnable.class);
@@ -682,7 +682,7 @@ class BeanFactoryGenericsTests {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans).hasSize(1);
+		assertThat(beans.size()).isEqualTo(1);
 	}

 	/**
@@ -697,7 +697,7 @@ class BeanFactoryGenericsTests {
 	 * <p>See SPR-10411
 	 */
 	@Test
-	void parameterizedInstanceFactoryMethod() {
+	public void parameterizedInstanceFactoryMethod() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();

 		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
@@ -714,11 +714,11 @@ class BeanFactoryGenericsTests {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans).hasSize(1);
+		assertThat(beans.size()).isEqualTo(1);
 	}

 	@Test
-	void parameterizedInstanceFactoryMethodWithNonResolvedClassName() {
+	public void parameterizedInstanceFactoryMethodWithNonResolvedClassName() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();

 		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
@@ -735,11 +735,11 @@ class BeanFactoryGenericsTests {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans).hasSize(1);
+		assertThat(beans.size()).isEqualTo(1);
 	}

 	@Test
-	void parameterizedInstanceFactoryMethodWithWrappedClassName() {
+	public void parameterizedInstanceFactoryMethodWithWrappedClassName() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();

 		RootBeanDefinition rbd = new RootBeanDefinition();
@@ -754,11 +754,11 @@ class BeanFactoryGenericsTests {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans).hasSize(1);
+		assertThat(beans.size()).isEqualTo(1);
 	}

 	@Test
-	void parameterizedInstanceFactoryMethodWithInvalidClassName() {
+	public void parameterizedInstanceFactoryMethodWithInvalidClassName() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();

 		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
@@ -775,11 +775,11 @@ class BeanFactoryGenericsTests {
 		assertThat(bf.getType("mock")).isNull();
 		assertThat(bf.getType("mock")).isNull();
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans).hasSize(0);
+		assertThat(beans.size()).isEqualTo(0);
 	}

 	@Test
-	void parameterizedInstanceFactoryMethodWithIndexedArgument() {
+	public void parameterizedInstanceFactoryMethodWithIndexedArgument() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();

 		RootBeanDefinition rbd = new RootBeanDefinition(MocksControl.class);
@@ -796,11 +796,11 @@ class BeanFactoryGenericsTests {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans).hasSize(1);
+		assertThat(beans.size()).isEqualTo(1);
 	}

 	@Test  // SPR-16720
-	void parameterizedInstanceFactoryMethodWithTempClassLoader() {
+	public void parameterizedInstanceFactoryMethodWithTempClassLoader() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.setTempClassLoader(new OverridingClassLoader(getClass().getClassLoader()));

@@ -818,11 +818,11 @@ class BeanFactoryGenericsTests {
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		assertThat(bf.getType("mock")).isEqualTo(Runnable.class);
 		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
-		assertThat(beans).hasSize(1);
+		assertThat(beans.size()).isEqualTo(1);
 	}

 	@Test
-	void testGenericMatchingWithBeanNameDifferentiation() {
+	public void testGenericMatchingWithBeanNameDifferentiation() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.setAutowireCandidateResolver(new GenericTypeAwareAutowireCandidateResolver());

@@ -838,15 +838,15 @@ class BeanFactoryGenericsTests {
 		String[] numberStoreNames = bf.getBeanNamesForType(ResolvableType.forClass(NumberStore.class));
 		String[] doubleStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Double.class));
 		String[] floatStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Float.class));
-		assertThat(numberStoreNames).hasSize(2);
+		assertThat(numberStoreNames.length).isEqualTo(2);
 		assertThat(numberStoreNames[0]).isEqualTo("doubleStore");
 		assertThat(numberStoreNames[1]).isEqualTo("floatStore");
-		assertThat(doubleStoreNames).hasSize(0);
-		assertThat(floatStoreNames).hasSize(0);
+		assertThat(doubleStoreNames.length).isEqualTo(0);
+		assertThat(floatStoreNames.length).isEqualTo(0);
 	}

 	@Test
-	void testGenericMatchingWithFullTypeDifferentiation() {
+	public void testGenericMatchingWithFullTypeDifferentiation() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.setDependencyComparator(AnnotationAwareOrderComparator.INSTANCE);
 		bf.setAutowireCandidateResolver(new GenericTypeAwareAutowireCandidateResolver());
@@ -867,12 +867,12 @@ class BeanFactoryGenericsTests {
 		String[] numberStoreNames = bf.getBeanNamesForType(ResolvableType.forClass(NumberStore.class));
 		String[] doubleStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Double.class));
 		String[] floatStoreNames = bf.getBeanNamesForType(ResolvableType.forClassWithGenerics(NumberStore.class, Float.class));
-		assertThat(numberStoreNames).hasSize(2);
+		assertThat(numberStoreNames.length).isEqualTo(2);
 		assertThat(numberStoreNames[0]).isEqualTo("store1");
 		assertThat(numberStoreNames[1]).isEqualTo("store2");
-		assertThat(doubleStoreNames).hasSize(1);
+		assertThat(doubleStoreNames.length).isEqualTo(1);
 		assertThat(doubleStoreNames[0]).isEqualTo("store1");
-		assertThat(floatStoreNames).hasSize(1);
+		assertThat(floatStoreNames.length).isEqualTo(1);
 		assertThat(floatStoreNames[0]).isEqualTo("store2");

 		ObjectProvider<NumberStore<?>> numberStoreProvider = bf.getBeanProvider(ResolvableType.forClass(NumberStore.class));
@@ -938,7 +938,7 @@ class BeanFactoryGenericsTests {
 	}

 	@Test
-	void testGenericMatchingWithUnresolvedOrderedStream() {
+	public void testGenericMatchingWithUnresolvedOrderedStream() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
 		bf.setDependencyComparator(AnnotationAwareOrderComparator.INSTANCE);
 		bf.setAutowireCandidateResolver(new GenericTypeAwareAutowireCandidateResolver());
@@ -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");
 	}
-
 }
@@ -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");
 	}
-
 }
@@ -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();
 	}
-
 }
@@ -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();
 	}
-
 }
@@ -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) {

 	}
-
 }
@@ -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,18 +26,18 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 *
 * @author Rick Evans
 */
-class ClassNameBeanWiringInfoResolverTests {
+public class ClassNameBeanWiringInfoResolverTests {

 	@Test
-	void resolveWiringInfoWithNullBeanInstance() throws Exception {
+	public void resolveWiringInfoWithNullBeanInstance() throws Exception {
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				new ClassNameBeanWiringInfoResolver().resolveWiringInfo(null));
 	}

 	@Test
-	void resolveWiringInfo() {
+	public void resolveWiringInfo() {
 		ClassNameBeanWiringInfoResolver resolver = new ClassNameBeanWiringInfoResolver();
-		Long beanInstance = 1L;
+		Long beanInstance = new Long(1);
 		BeanWiringInfo info = resolver.resolveWiringInfo(beanInstance);
 		assertThat(info).isNotNull();
 		assertThat(info.getBeanName()).as("Not resolving bean name to the class name of the supplied bean instance as per class contract.").isEqualTo(beanInstance.getClass().getName());
@@ -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.
@@ -64,10 +64,10 @@ import static org.assertj.core.api.Assertions.within;
 * @author Chris Beams
 * @since 10.06.2003
 */
-class CustomEditorTests {
+public class CustomEditorTests {

 	@Test
-	void testComplexObject() {
+	public void testComplexObject() {
 		TestBean tb = new TestBean();
 		String newName = "Rod";
 		String tbString = "Kerry_34";
@@ -80,12 +80,12 @@ class CustomEditorTests {
 		pvs.addPropertyValue(new PropertyValue("touchy", "valid"));
 		pvs.addPropertyValue(new PropertyValue("spouse", tbString));
 		bw.setPropertyValues(pvs);
-		assertThat(tb.getSpouse()).as("spouse is non-null").isNotNull();
+		assertThat(tb.getSpouse() != null).as("spouse is non-null").isTrue();
 		assertThat(tb.getSpouse().getName().equals("Kerry") && tb.getSpouse().getAge() == 34).as("spouse name is Kerry and age is 34").isTrue();
 	}

 	@Test
-	void testComplexObjectWithOldValueAccess() {
+	public void testComplexObjectWithOldValueAccess() {
 		TestBean tb = new TestBean();
 		String newName = "Rod";
 		String tbString = "Kerry_34";
@@ -100,7 +100,7 @@ class CustomEditorTests {
 		pvs.addPropertyValue(new PropertyValue("spouse", tbString));

 		bw.setPropertyValues(pvs);
-		assertThat(tb.getSpouse()).as("spouse is non-null").isNotNull();
+		assertThat(tb.getSpouse() != null).as("spouse is non-null").isTrue();
 		assertThat(tb.getSpouse().getName().equals("Kerry") && tb.getSpouse().getAge() == 34).as("spouse name is Kerry and age is 34").isTrue();
 		ITestBean spouse = tb.getSpouse();

@@ -109,7 +109,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testCustomEditorForSingleProperty() {
+	public void testCustomEditorForSingleProperty() {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, "name", new PropertyEditorSupport() {
@@ -127,7 +127,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testCustomEditorForAllStringProperties() {
+	public void testCustomEditorForAllStringProperties() {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
@@ -145,7 +145,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testCustomEditorForSingleNestedProperty() {
+	public void testCustomEditorForSingleNestedProperty() {
 		TestBean tb = new TestBean();
 		tb.setSpouse(new TestBean());
 		BeanWrapper bw = new BeanWrapperImpl(tb);
@@ -164,7 +164,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testCustomEditorForAllNestedStringProperties() {
+	public void testCustomEditorForAllNestedStringProperties() {
 		TestBean tb = new TestBean();
 		tb.setSpouse(new TestBean());
 		BeanWrapper bw = new BeanWrapperImpl(tb);
@@ -183,7 +183,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testDefaultBooleanEditorForPrimitiveType() {
+	public void testDefaultBooleanEditorForPrimitiveType() {
 		BooleanTestBean tb = new BooleanTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);

@@ -229,7 +229,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testDefaultBooleanEditorForWrapperType() {
+	public void testDefaultBooleanEditorForWrapperType() {
 		BooleanTestBean tb = new BooleanTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);

@@ -239,28 +239,28 @@ class CustomEditorTests {

 		bw.setPropertyValue("bool2", "false");
 		assertThat(Boolean.FALSE.equals(bw.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue();
-		boolean condition3 = !tb.getBool2();
+		boolean condition3 = !tb.getBool2().booleanValue();
 		assertThat(condition3).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "on");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "off");
-		boolean condition2 = !tb.getBool2();
+		boolean condition2 = !tb.getBool2().booleanValue();
 		assertThat(condition2).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "yes");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "no");
-		boolean condition1 = !tb.getBool2();
+		boolean condition1 = !tb.getBool2().booleanValue();
 		assertThat(condition1).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "1");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "0");
-		boolean condition = !tb.getBool2();
+		boolean condition = !tb.getBool2().booleanValue();
 		assertThat(condition).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "");
@@ -268,7 +268,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testCustomBooleanEditorWithAllowEmpty() {
+	public void testCustomBooleanEditorWithAllowEmpty() {
 		BooleanTestBean tb = new BooleanTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(Boolean.class, new CustomBooleanEditor(true));
@@ -279,37 +279,37 @@ class CustomEditorTests {

 		bw.setPropertyValue("bool2", "false");
 		assertThat(Boolean.FALSE.equals(bw.getPropertyValue("bool2"))).as("Correct bool2 value").isTrue();
-		boolean condition3 = !tb.getBool2();
+		boolean condition3 = !tb.getBool2().booleanValue();
 		assertThat(condition3).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "on");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "off");
-		boolean condition2 = !tb.getBool2();
+		boolean condition2 = !tb.getBool2().booleanValue();
 		assertThat(condition2).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "yes");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "no");
-		boolean condition1 = !tb.getBool2();
+		boolean condition1 = !tb.getBool2().booleanValue();
 		assertThat(condition1).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "1");
 		assertThat(tb.getBool2().booleanValue()).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "0");
-		boolean condition = !tb.getBool2();
+		boolean condition = !tb.getBool2().booleanValue();
 		assertThat(condition).as("Correct bool2 value").isTrue();

 		bw.setPropertyValue("bool2", "");
-		assertThat(bw.getPropertyValue("bool2")).as("Correct bool2 value").isNull();
-		assertThat(tb.getBool2()).as("Correct bool2 value").isNull();
+		assertThat(bw.getPropertyValue("bool2") == null).as("Correct bool2 value").isTrue();
+		assertThat(tb.getBool2() == null).as("Correct bool2 value").isTrue();
 	}

 	@Test
-	void testCustomBooleanEditorWithSpecialTrueAndFalseStrings() throws Exception {
+	public void testCustomBooleanEditorWithSpecialTrueAndFalseStrings() throws Exception {
 		String trueString = "pechorin";
 		String falseString = "nash";

@@ -333,7 +333,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testDefaultNumberEditor() {
+	public void testDefaultNumberEditor() {
 		NumberTestBean tb = new NumberTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);

@@ -350,34 +350,34 @@ class CustomEditorTests {
 		bw.setPropertyValue("double2", "6.1");
 		bw.setPropertyValue("bigDecimal", "4.5");

-		assertThat(Short.valueOf("1").equals(bw.getPropertyValue("short1"))).as("Correct short1 value").isTrue();
+		assertThat(new Short("1").equals(bw.getPropertyValue("short1"))).as("Correct short1 value").isTrue();
 		assertThat(tb.getShort1() == 1).as("Correct short1 value").isTrue();
-		assertThat(Short.valueOf("2").equals(bw.getPropertyValue("short2"))).as("Correct short2 value").isTrue();
-		assertThat(Short.valueOf("2").equals(tb.getShort2())).as("Correct short2 value").isTrue();
-		assertThat(Integer.valueOf("7").equals(bw.getPropertyValue("int1"))).as("Correct int1 value").isTrue();
+		assertThat(new Short("2").equals(bw.getPropertyValue("short2"))).as("Correct short2 value").isTrue();
+		assertThat(new Short("2").equals(tb.getShort2())).as("Correct short2 value").isTrue();
+		assertThat(new Integer("7").equals(bw.getPropertyValue("int1"))).as("Correct int1 value").isTrue();
 		assertThat(tb.getInt1() == 7).as("Correct int1 value").isTrue();
-		assertThat(Integer.valueOf("8").equals(bw.getPropertyValue("int2"))).as("Correct int2 value").isTrue();
-		assertThat(Integer.valueOf("8").equals(tb.getInt2())).as("Correct int2 value").isTrue();
-		assertThat(Long.valueOf("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
+		assertThat(new Integer("8").equals(bw.getPropertyValue("int2"))).as("Correct int2 value").isTrue();
+		assertThat(new Integer("8").equals(tb.getInt2())).as("Correct int2 value").isTrue();
+		assertThat(new Long("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
 		assertThat(tb.getLong1() == 5).as("Correct long1 value").isTrue();
-		assertThat(Long.valueOf("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
-		assertThat(Long.valueOf("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
+		assertThat(new Long("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
+		assertThat(new Long("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
 		assertThat(new BigInteger("3").equals(bw.getPropertyValue("bigInteger"))).as("Correct bigInteger value").isTrue();
 		assertThat(new BigInteger("3").equals(tb.getBigInteger())).as("Correct bigInteger value").isTrue();
-		assertThat(Float.valueOf("7.1").equals(bw.getPropertyValue("float1"))).as("Correct float1 value").isTrue();
-		assertThat(Float.valueOf("7.1").equals(tb.getFloat1())).as("Correct float1 value").isTrue();
-		assertThat(Float.valueOf("8.1").equals(bw.getPropertyValue("float2"))).as("Correct float2 value").isTrue();
-		assertThat(Float.valueOf("8.1").equals(tb.getFloat2())).as("Correct float2 value").isTrue();
-		assertThat(Double.valueOf("5.1").equals(bw.getPropertyValue("double1"))).as("Correct double1 value").isTrue();
+		assertThat(new Float("7.1").equals(bw.getPropertyValue("float1"))).as("Correct float1 value").isTrue();
+		assertThat(new Float("7.1").equals(new Float(tb.getFloat1()))).as("Correct float1 value").isTrue();
+		assertThat(new Float("8.1").equals(bw.getPropertyValue("float2"))).as("Correct float2 value").isTrue();
+		assertThat(new Float("8.1").equals(tb.getFloat2())).as("Correct float2 value").isTrue();
+		assertThat(new Double("5.1").equals(bw.getPropertyValue("double1"))).as("Correct double1 value").isTrue();
 		assertThat(tb.getDouble1() == 5.1).as("Correct double1 value").isTrue();
-		assertThat(Double.valueOf("6.1").equals(bw.getPropertyValue("double2"))).as("Correct double2 value").isTrue();
-		assertThat(Double.valueOf("6.1").equals(tb.getDouble2())).as("Correct double2 value").isTrue();
+		assertThat(new Double("6.1").equals(bw.getPropertyValue("double2"))).as("Correct double2 value").isTrue();
+		assertThat(new Double("6.1").equals(tb.getDouble2())).as("Correct double2 value").isTrue();
 		assertThat(new BigDecimal("4.5").equals(bw.getPropertyValue("bigDecimal"))).as("Correct bigDecimal value").isTrue();
 		assertThat(new BigDecimal("4.5").equals(tb.getBigDecimal())).as("Correct bigDecimal value").isTrue();
 	}

 	@Test
-	void testCustomNumberEditorWithoutAllowEmpty() {
+	public void testCustomNumberEditorWithoutAllowEmpty() {
 		NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN);
 		NumberTestBean tb = new NumberTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
@@ -407,34 +407,34 @@ class CustomEditorTests {
 		bw.setPropertyValue("double2", "6,1");
 		bw.setPropertyValue("bigDecimal", "4,5");

-		assertThat(bw.getPropertyValue("short1")).as("Correct short1 value").isEqualTo(Short.valueOf("1"));
+		assertThat(new Short("1").equals(bw.getPropertyValue("short1"))).as("Correct short1 value").isTrue();
 		assertThat(tb.getShort1() == 1).as("Correct short1 value").isTrue();
-		assertThat(bw.getPropertyValue("short2")).as("Correct short2 value").isEqualTo(Short.valueOf("2"));
-		assertThat(tb.getShort2()).as("Correct short2 value").isEqualTo(Short.valueOf("2"));
-		assertThat(bw.getPropertyValue("int1")).as("Correct int1 value").isEqualTo(Integer.valueOf("7"));
+		assertThat(new Short("2").equals(bw.getPropertyValue("short2"))).as("Correct short2 value").isTrue();
+		assertThat(new Short("2").equals(tb.getShort2())).as("Correct short2 value").isTrue();
+		assertThat(new Integer("7").equals(bw.getPropertyValue("int1"))).as("Correct int1 value").isTrue();
 		assertThat(tb.getInt1() == 7).as("Correct int1 value").isTrue();
-		assertThat(bw.getPropertyValue("int2")).as("Correct int2 value").isEqualTo(Integer.valueOf("8"));
-		assertThat(tb.getInt2()).as("Correct int2 value").isEqualTo(Integer.valueOf("8"));
-		assertThat(bw.getPropertyValue("long1")).as("Correct long1 value").isEqualTo(Long.valueOf("5"));
+		assertThat(new Integer("8").equals(bw.getPropertyValue("int2"))).as("Correct int2 value").isTrue();
+		assertThat(new Integer("8").equals(tb.getInt2())).as("Correct int2 value").isTrue();
+		assertThat(new Long("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
 		assertThat(tb.getLong1() == 5).as("Correct long1 value").isTrue();
-		assertThat(bw.getPropertyValue("long2")).as("Correct long2 value").isEqualTo(Long.valueOf("6"));
-		assertThat(tb.getLong2()).as("Correct long2 value").isEqualTo(Long.valueOf("6"));
+		assertThat(new Long("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
+		assertThat(new Long("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
 		assertThat(new BigInteger("3").equals(bw.getPropertyValue("bigInteger"))).as("Correct bigInteger value").isTrue();
 		assertThat(new BigInteger("3").equals(tb.getBigInteger())).as("Correct bigInteger value").isTrue();
-		assertThat(bw.getPropertyValue("float1")).as("Correct float1 value").isEqualTo(Float.valueOf("7.1"));
-		assertThat(Float.valueOf(tb.getFloat1())).as("Correct float1 value").isEqualTo(Float.valueOf("7.1"));
-		assertThat(bw.getPropertyValue("float2")).as("Correct float2 value").isEqualTo(Float.valueOf("8.1"));
-		assertThat(tb.getFloat2()).as("Correct float2 value").isEqualTo(Float.valueOf("8.1"));
-		assertThat(bw.getPropertyValue("double1")).as("Correct double1 value").isEqualTo(Double.valueOf("5.1"));
+		assertThat(new Float("7.1").equals(bw.getPropertyValue("float1"))).as("Correct float1 value").isTrue();
+		assertThat(new Float("7.1").equals(new Float(tb.getFloat1()))).as("Correct float1 value").isTrue();
+		assertThat(new Float("8.1").equals(bw.getPropertyValue("float2"))).as("Correct float2 value").isTrue();
+		assertThat(new Float("8.1").equals(tb.getFloat2())).as("Correct float2 value").isTrue();
+		assertThat(new Double("5.1").equals(bw.getPropertyValue("double1"))).as("Correct double1 value").isTrue();
 		assertThat(tb.getDouble1() == 5.1).as("Correct double1 value").isTrue();
-		assertThat(bw.getPropertyValue("double2")).as("Correct double2 value").isEqualTo(Double.valueOf("6.1"));
-		assertThat(tb.getDouble2()).as("Correct double2 value").isEqualTo(Double.valueOf("6.1"));
+		assertThat(new Double("6.1").equals(bw.getPropertyValue("double2"))).as("Correct double2 value").isTrue();
+		assertThat(new Double("6.1").equals(tb.getDouble2())).as("Correct double2 value").isTrue();
 		assertThat(new BigDecimal("4.5").equals(bw.getPropertyValue("bigDecimal"))).as("Correct bigDecimal value").isTrue();
 		assertThat(new BigDecimal("4.5").equals(tb.getBigDecimal())).as("Correct bigDecimal value").isTrue();
 	}

 	@Test
-	void testCustomNumberEditorWithAllowEmpty() {
+	public void testCustomNumberEditorWithAllowEmpty() {
 		NumberFormat nf = NumberFormat.getNumberInstance(Locale.GERMAN);
 		NumberTestBean tb = new NumberTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
@@ -443,10 +443,10 @@ class CustomEditorTests {

 		bw.setPropertyValue("long1", "5");
 		bw.setPropertyValue("long2", "6");
-		assertThat(Long.valueOf("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
+		assertThat(new Long("5").equals(bw.getPropertyValue("long1"))).as("Correct long1 value").isTrue();
 		assertThat(tb.getLong1() == 5).as("Correct long1 value").isTrue();
-		assertThat(Long.valueOf("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
-		assertThat(Long.valueOf("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();
+		assertThat(new Long("6").equals(bw.getPropertyValue("long2"))).as("Correct long2 value").isTrue();
+		assertThat(new Long("6").equals(tb.getLong2())).as("Correct long2 value").isTrue();

 		bw.setPropertyValue("long2", "");
 		assertThat(bw.getPropertyValue("long2") == null).as("Correct long2 value").isTrue();
@@ -458,7 +458,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testCustomNumberEditorWithFrenchBigDecimal() throws Exception {
+	public void testCustomNumberEditorWithFrenchBigDecimal() throws Exception {
 		NumberFormat nf = NumberFormat.getNumberInstance(Locale.FRENCH);
 		NumberTestBean tb = new NumberTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
@@ -475,14 +475,14 @@ class CustomEditorTests {
 	}

 	@Test
-	void testParseShortGreaterThanMaxValueWithoutNumberFormat() {
+	public void testParseShortGreaterThanMaxValueWithoutNumberFormat() {
 		CustomNumberEditor editor = new CustomNumberEditor(Short.class, true);
 		assertThatExceptionOfType(NumberFormatException.class).as("greater than Short.MAX_VALUE + 1").isThrownBy(() ->
 			editor.setAsText(String.valueOf(Short.MAX_VALUE + 1)));
 	}

 	@Test
-	void testByteArrayPropertyEditor() {
+	public void testByteArrayPropertyEditor() {
 		PrimitiveArrayBean bean = new PrimitiveArrayBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.setPropertyValue("byteArray", "myvalue");
@@ -490,7 +490,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testCharArrayPropertyEditor() {
+	public void testCharArrayPropertyEditor() {
 		PrimitiveArrayBean bean = new PrimitiveArrayBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.setPropertyValue("charArray", "myvalue");
@@ -498,7 +498,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testCharacterEditor() {
+	public void testCharacterEditor() {
 		CharBean cb = new CharBean();
 		BeanWrapper bw = new BeanWrapperImpl(cb);

@@ -520,78 +520,78 @@ class CustomEditorTests {
 	}

 	@Test
-	void testCharacterEditorWithAllowEmpty() {
+	public void testCharacterEditorWithAllowEmpty() {
 		CharBean cb = new CharBean();
 		BeanWrapper bw = new BeanWrapperImpl(cb);
 		bw.registerCustomEditor(Character.class, new CharacterEditor(true));

-		bw.setPropertyValue("myCharacter", 'c');
-		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf('c'));
+		bw.setPropertyValue("myCharacter", new Character('c'));
+		assertThat(cb.getMyCharacter()).isEqualTo(new Character('c'));

 		bw.setPropertyValue("myCharacter", "c");
-		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf('c'));
+		assertThat(cb.getMyCharacter()).isEqualTo(new Character('c'));

 		bw.setPropertyValue("myCharacter", "\u0041");
-		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf('A'));
+		assertThat(cb.getMyCharacter()).isEqualTo(new Character('A'));

 		bw.setPropertyValue("myCharacter", " ");
-		assertThat(cb.getMyCharacter()).isEqualTo(Character.valueOf(' '));
+		assertThat(cb.getMyCharacter()).isEqualTo(new Character(' '));

 		bw.setPropertyValue("myCharacter", "");
 		assertThat(cb.getMyCharacter()).isNull();
 	}

 	@Test
-	void testCharacterEditorSetAsTextWithStringLongerThanOneCharacter() throws Exception {
+	public void testCharacterEditorSetAsTextWithStringLongerThanOneCharacter() throws Exception {
 		PropertyEditor charEditor = new CharacterEditor(false);
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				charEditor.setAsText("ColdWaterCanyon"));
 	}

 	@Test
-	void testCharacterEditorGetAsTextReturnsEmptyStringIfValueIsNull() throws Exception {
+	public void testCharacterEditorGetAsTextReturnsEmptyStringIfValueIsNull() throws Exception {
 		PropertyEditor charEditor = new CharacterEditor(false);
-		assertThat(charEditor.getAsText()).isEmpty();
+		assertThat(charEditor.getAsText()).isEqualTo("");
 		charEditor = new CharacterEditor(true);
 		charEditor.setAsText(null);
-		assertThat(charEditor.getAsText()).isEmpty();
+		assertThat(charEditor.getAsText()).isEqualTo("");
 		charEditor.setAsText("");
-		assertThat(charEditor.getAsText()).isEmpty();
+		assertThat(charEditor.getAsText()).isEqualTo("");
 		charEditor.setAsText(" ");
 		assertThat(charEditor.getAsText()).isEqualTo(" ");
 	}

 	@Test
-	void testCharacterEditorSetAsTextWithNullNotAllowingEmptyAsNull() throws Exception {
+	public void testCharacterEditorSetAsTextWithNullNotAllowingEmptyAsNull() throws Exception {
 		PropertyEditor charEditor = new CharacterEditor(false);
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				charEditor.setAsText(null));
 	}

 	@Test
-	void testClassEditor() {
+	public void testClassEditor() {
 		PropertyEditor classEditor = new ClassEditor();
 		classEditor.setAsText(TestBean.class.getName());
 		assertThat(classEditor.getValue()).isEqualTo(TestBean.class);
 		assertThat(classEditor.getAsText()).isEqualTo(TestBean.class.getName());

 		classEditor.setAsText(null);
-		assertThat(classEditor.getAsText()).isEmpty();
+		assertThat(classEditor.getAsText()).isEqualTo("");
 		classEditor.setAsText("");
-		assertThat(classEditor.getAsText()).isEmpty();
+		assertThat(classEditor.getAsText()).isEqualTo("");
 		classEditor.setAsText("\t  ");
-		assertThat(classEditor.getAsText()).isEmpty();
+		assertThat(classEditor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testClassEditorWithNonExistentClass() throws Exception {
+	public void testClassEditorWithNonExistentClass() throws Exception {
 		PropertyEditor classEditor = new ClassEditor();
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				classEditor.setAsText("hairdresser.on.Fire"));
 	}

 	@Test
-	void testClassEditorWithArray() {
+	public void testClassEditorWithArray() {
 		PropertyEditor classEditor = new ClassEditor();
 		classEditor.setAsText("org.springframework.beans.testfixture.beans.TestBean[]");
 		assertThat(classEditor.getValue()).isEqualTo(TestBean[].class);
@@ -602,7 +602,7 @@ class CustomEditorTests {
 	* SPR_2165 - ClassEditor is inconsistent with multidimensional arrays
 	*/
 	@Test
-	void testGetAsTextWithTwoDimensionalArray() throws Exception {
+	public void testGetAsTextWithTwoDimensionalArray() throws Exception {
 		String[][] chessboard = new String[8][8];
 		ClassEditor editor = new ClassEditor();
 		editor.setValue(chessboard.getClass());
@@ -613,7 +613,7 @@ class CustomEditorTests {
 	 * SPR_2165 - ClassEditor is inconsistent with multidimensional arrays
 	 */
 	@Test
-	void testGetAsTextWithRidiculousMultiDimensionalArray() throws Exception {
+	public void testGetAsTextWithRidiculousMultiDimensionalArray() throws Exception {
 		String[][][][][] ridiculousChessboard = new String[8][4][0][1][3];
 		ClassEditor editor = new ClassEditor();
 		editor.setValue(ridiculousChessboard.getClass());
@@ -621,7 +621,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testFileEditor() {
+	public void testFileEditor() {
 		PropertyEditor fileEditor = new FileEditor();
 		fileEditor.setAsText("file:myfile.txt");
 		assertThat(fileEditor.getValue()).isEqualTo(new File("myfile.txt"));
@@ -629,7 +629,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testFileEditorWithRelativePath() {
+	public void testFileEditorWithRelativePath() {
 		PropertyEditor fileEditor = new FileEditor();
 		try {
 			fileEditor.setAsText("myfile.txt");
@@ -641,7 +641,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testFileEditorWithAbsolutePath() {
+	public void testFileEditorWithAbsolutePath() {
 		PropertyEditor fileEditor = new FileEditor();
 		// testing on Windows
 		if (new File("C:/myfile.txt").isAbsolute()) {
@@ -656,18 +656,18 @@ class CustomEditorTests {
 	}

 	@Test
-	void testLocaleEditor() {
+	public void testLocaleEditor() {
 		PropertyEditor localeEditor = new LocaleEditor();
 		localeEditor.setAsText("en_CA");
 		assertThat(localeEditor.getValue()).isEqualTo(Locale.CANADA);
 		assertThat(localeEditor.getAsText()).isEqualTo("en_CA");

 		localeEditor = new LocaleEditor();
-		assertThat(localeEditor.getAsText()).isEmpty();
+		assertThat(localeEditor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testPatternEditor() {
+	public void testPatternEditor() {
 		final String REGEX = "a.*";

 		PropertyEditor patternEditor = new PatternEditor();
@@ -676,15 +676,15 @@ class CustomEditorTests {
 		assertThat(patternEditor.getAsText()).isEqualTo(REGEX);

 		patternEditor = new PatternEditor();
-		assertThat(patternEditor.getAsText()).isEmpty();
+		assertThat(patternEditor.getAsText()).isEqualTo("");

 		patternEditor = new PatternEditor();
 		patternEditor.setAsText(null);
-		assertThat(patternEditor.getAsText()).isEmpty();
+		assertThat(patternEditor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testCustomBooleanEditor() {
+	public void testCustomBooleanEditor() {
 		CustomBooleanEditor editor = new CustomBooleanEditor(false);

 		editor.setAsText("true");
@@ -696,15 +696,15 @@ class CustomEditorTests {
 		assertThat(editor.getAsText()).isEqualTo("false");

 		editor.setValue(null);
-		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getValue()).isEqualTo(null);
+		assertThat(editor.getAsText()).isEqualTo("");

 		assertThatIllegalArgumentException().isThrownBy(() ->
 				editor.setAsText(null));
 	}

 	@Test
-	void testCustomBooleanEditorWithEmptyAsNull() {
+	public void testCustomBooleanEditorWithEmptyAsNull() {
 		CustomBooleanEditor editor = new CustomBooleanEditor(true);

 		editor.setAsText("true");
@@ -716,34 +716,34 @@ class CustomEditorTests {
 		assertThat(editor.getAsText()).isEqualTo("false");

 		editor.setValue(null);
-		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getValue()).isEqualTo(null);
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testCustomDateEditor() {
+	public void testCustomDateEditor() {
 		CustomDateEditor editor = new CustomDateEditor(null, false);
 		editor.setValue(null);
-		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getValue()).isEqualTo(null);
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testCustomDateEditorWithEmptyAsNull() {
+	public void testCustomDateEditorWithEmptyAsNull() {
 		CustomDateEditor editor = new CustomDateEditor(null, true);
 		editor.setValue(null);
-		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getValue()).isEqualTo(null);
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testCustomDateEditorWithExactDateLength() {
+	public void testCustomDateEditorWithExactDateLength() {
 		int maxLength = 10;
 		String validDate = "01/01/2005";
 		String invalidDate = "01/01/05";

-		assertThat(validDate).hasSize(maxLength);
-		assertThat(invalidDate.length()).isNotEqualTo(maxLength);
+		assertThat(validDate.length() == maxLength).isTrue();
+		assertThat(invalidDate.length() == maxLength).isFalse();

 		CustomDateEditor editor = new CustomDateEditor(new SimpleDateFormat("MM/dd/yyyy"), true, maxLength);
 		editor.setAsText(validDate);
@@ -753,39 +753,39 @@ class CustomEditorTests {
 	}

 	@Test
-	void testCustomNumberEditor() {
+	public void testCustomNumberEditor() {
 		CustomNumberEditor editor = new CustomNumberEditor(Integer.class, false);
 		editor.setAsText("5");
 		assertThat(editor.getValue()).isEqualTo(5);
 		assertThat(editor.getAsText()).isEqualTo("5");
 		editor.setValue(null);
-		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getValue()).isEqualTo(null);
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testCustomNumberEditorWithHex() {
+	public void testCustomNumberEditorWithHex() {
 		CustomNumberEditor editor = new CustomNumberEditor(Integer.class, false);
 		editor.setAsText("0x" + Integer.toHexString(64));
 		assertThat(editor.getValue()).isEqualTo(64);
 	}

 	@Test
-	void testCustomNumberEditorWithEmptyAsNull() {
+	public void testCustomNumberEditorWithEmptyAsNull() {
 		CustomNumberEditor editor = new CustomNumberEditor(Integer.class, true);
 		editor.setAsText("5");
 		assertThat(editor.getValue()).isEqualTo(5);
 		assertThat(editor.getAsText()).isEqualTo("5");
 		editor.setAsText("");
-		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getValue()).isEqualTo(null);
+		assertThat(editor.getAsText()).isEqualTo("");
 		editor.setValue(null);
-		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getValue()).isEqualTo(null);
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testStringTrimmerEditor() {
+	public void testStringTrimmerEditor() {
 		StringTrimmerEditor editor = new StringTrimmerEditor(false);
 		editor.setAsText("test");
 		assertThat(editor.getValue()).isEqualTo("test");
@@ -795,15 +795,15 @@ class CustomEditorTests {
 		assertThat(editor.getAsText()).isEqualTo("test");
 		editor.setAsText("");
 		assertThat(editor.getValue()).isEqualTo("");
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getAsText()).isEqualTo("");
 		editor.setValue(null);
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getAsText()).isEqualTo("");
 		editor.setAsText(null);
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testStringTrimmerEditorWithEmptyAsNull() {
+	public void testStringTrimmerEditorWithEmptyAsNull() {
 		StringTrimmerEditor editor = new StringTrimmerEditor(true);
 		editor.setAsText("test");
 		assertThat(editor.getValue()).isEqualTo("test");
@@ -812,14 +812,14 @@ class CustomEditorTests {
 		assertThat(editor.getValue()).isEqualTo("test");
 		assertThat(editor.getAsText()).isEqualTo("test");
 		editor.setAsText("  ");
-		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getValue()).isEqualTo(null);
+		assertThat(editor.getAsText()).isEqualTo("");
 		editor.setValue(null);
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testStringTrimmerEditorWithCharsToDelete() {
+	public void testStringTrimmerEditorWithCharsToDelete() {
 		StringTrimmerEditor editor = new StringTrimmerEditor("\r\n\f", false);
 		editor.setAsText("te\ns\ft");
 		assertThat(editor.getValue()).isEqualTo("test");
@@ -829,13 +829,13 @@ class CustomEditorTests {
 		assertThat(editor.getAsText()).isEqualTo("test");
 		editor.setAsText("");
 		assertThat(editor.getValue()).isEqualTo("");
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getAsText()).isEqualTo("");
 		editor.setValue(null);
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testStringTrimmerEditorWithCharsToDeleteAndEmptyAsNull() {
+	public void testStringTrimmerEditorWithCharsToDeleteAndEmptyAsNull() {
 		StringTrimmerEditor editor = new StringTrimmerEditor("\r\n\f", true);
 		editor.setAsText("te\ns\ft");
 		assertThat(editor.getValue()).isEqualTo("test");
@@ -844,14 +844,14 @@ class CustomEditorTests {
 		assertThat(editor.getValue()).isEqualTo("test");
 		assertThat(editor.getAsText()).isEqualTo("test");
 		editor.setAsText(" \n\f ");
-		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getValue()).isEqualTo(null);
+		assertThat(editor.getAsText()).isEqualTo("");
 		editor.setValue(null);
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testIndexedPropertiesWithCustomEditorForType() {
+	public void testIndexedPropertiesWithCustomEditorForType() {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
@@ -904,7 +904,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testIndexedPropertiesWithCustomEditorForProperty() {
+	public void testIndexedPropertiesWithCustomEditorForProperty() {
 		IndexedTestBean bean = new IndexedTestBean(false);
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, "array.name", new PropertyEditorSupport() {
@@ -971,7 +971,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testIndexedPropertiesWithIndividualCustomEditorForProperty() {
+	public void testIndexedPropertiesWithIndividualCustomEditorForProperty() {
 		IndexedTestBean bean = new IndexedTestBean(false);
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(String.class, "array[0].name", new PropertyEditorSupport() {
@@ -1056,7 +1056,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testNestedIndexedPropertiesWithCustomEditorForProperty() {
+	public void testNestedIndexedPropertiesWithCustomEditorForProperty() {
 		IndexedTestBean bean = new IndexedTestBean();
 		TestBean tb0 = bean.getArray()[0];
 		TestBean tb1 = bean.getArray()[1];
@@ -1140,7 +1140,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testNestedIndexedPropertiesWithIndexedCustomEditorForProperty() {
+	public void testNestedIndexedPropertiesWithIndexedCustomEditorForProperty() {
 		IndexedTestBean bean = new IndexedTestBean();
 		TestBean tb0 = bean.getArray()[0];
 		TestBean tb1 = bean.getArray()[1];
@@ -1191,7 +1191,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testIndexedPropertiesWithDirectAccessAndPropertyEditors() {
+	public void testIndexedPropertiesWithDirectAccessAndPropertyEditors() {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(TestBean.class, "array", new PropertyEditorSupport() {
@@ -1245,7 +1245,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testIndexedPropertiesWithDirectAccessAndSpecificPropertyEditors() {
+	public void testIndexedPropertiesWithDirectAccessAndSpecificPropertyEditors() {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(TestBean.class, "array[0]", new PropertyEditorSupport() {
@@ -1332,7 +1332,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testIndexedPropertiesWithListPropertyEditor() {
+	public void testIndexedPropertiesWithListPropertyEditor() {
 		IndexedTestBean bean = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		bw.registerCustomEditor(List.class, "list", new PropertyEditorSupport() {
@@ -1350,7 +1350,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testConversionToOldCollections() throws PropertyVetoException {
+	public void testConversionToOldCollections() throws PropertyVetoException {
 		OldCollectionsBean tb = new OldCollectionsBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(Vector.class, new CustomCollectionEditor(Vector.class));
@@ -1367,7 +1367,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testUninitializedArrayPropertyWithCustomEditor() {
+	public void testUninitializedArrayPropertyWithCustomEditor() {
 		IndexedTestBean bean = new IndexedTestBean(false);
 		BeanWrapper bw = new BeanWrapperImpl(bean);
 		PropertyEditor pe = new CustomNumberEditor(Integer.class, true);
@@ -1383,7 +1383,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testArrayToArrayConversion() throws PropertyVetoException {
+	public void testArrayToArrayConversion() throws PropertyVetoException {
 		IndexedTestBean tb = new IndexedTestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(TestBean.class, new PropertyEditorSupport() {
@@ -1399,7 +1399,7 @@ class CustomEditorTests {
 	}

 	@Test
-	void testArrayToStringConversion() throws PropertyVetoException {
+	public void testArrayToStringConversion() throws PropertyVetoException {
 		TestBean tb = new TestBean();
 		BeanWrapper bw = new BeanWrapperImpl(tb);
 		bw.registerCustomEditor(String.class, new PropertyEditorSupport() {
@@ -1408,16 +1408,16 @@ class CustomEditorTests {
 				setValue("-" + text + "-");
 			}
 		});
-		bw.setPropertyValue("name", new String[]{"a", "b"});
+		bw.setPropertyValue("name", new String[] {"a", "b"});
 		assertThat(tb.getName()).isEqualTo("-a,b-");
 	}

 	@Test
-	void testClassArrayEditorSunnyDay() throws Exception {
+	public void testClassArrayEditorSunnyDay() throws Exception {
 		ClassArrayEditor classArrayEditor = new ClassArrayEditor();
 		classArrayEditor.setAsText("java.lang.String,java.util.HashMap");
 		Class<?>[] classes = (Class<?>[]) classArrayEditor.getValue();
-		assertThat(classes).hasSize(2);
+		assertThat(classes.length).isEqualTo(2);
 		assertThat(classes[0]).isEqualTo(String.class);
 		assertThat(classes[1]).isEqualTo(HashMap.class);
 		assertThat(classArrayEditor.getAsText()).isEqualTo("java.lang.String,java.util.HashMap");
@@ -1426,11 +1426,11 @@ class CustomEditorTests {
 	}

 	@Test
-	void testClassArrayEditorSunnyDayWithArrayTypes() throws Exception {
+	public void testClassArrayEditorSunnyDayWithArrayTypes() throws Exception {
 		ClassArrayEditor classArrayEditor = new ClassArrayEditor();
 		classArrayEditor.setAsText("java.lang.String[],java.util.Map[],int[],float[][][]");
 		Class<?>[] classes = (Class<?>[]) classArrayEditor.getValue();
-		assertThat(classes).hasSize(4);
+		assertThat(classes.length).isEqualTo(4);
 		assertThat(classes[0]).isEqualTo(String[].class);
 		assertThat(classes[1]).isEqualTo(Map[].class);
 		assertThat(classes[2]).isEqualTo(int[].class);
@@ -1441,31 +1441,31 @@ class CustomEditorTests {
 	}

 	@Test
-	void testClassArrayEditorSetAsTextWithNull() throws Exception {
+	public void testClassArrayEditorSetAsTextWithNull() throws Exception {
 		ClassArrayEditor editor = new ClassArrayEditor();
 		editor.setAsText(null);
 		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testClassArrayEditorSetAsTextWithEmptyString() throws Exception {
+	public void testClassArrayEditorSetAsTextWithEmptyString() throws Exception {
 		ClassArrayEditor editor = new ClassArrayEditor();
 		editor.setAsText("");
 		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testClassArrayEditorSetAsTextWithWhitespaceString() throws Exception {
+	public void testClassArrayEditorSetAsTextWithWhitespaceString() throws Exception {
 		ClassArrayEditor editor = new ClassArrayEditor();
 		editor.setAsText("\n");
 		assertThat(editor.getValue()).isNull();
-		assertThat(editor.getAsText()).isEmpty();
+		assertThat(editor.getAsText()).isEqualTo("");
 	}

 	@Test
-	void testCharsetEditor() throws Exception {
+	public void testCharsetEditor() throws Exception {
 		CharsetEditor editor = new CharsetEditor();
 		String name = "UTF-8";
 		editor.setAsText(name);
@@ -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;
 	}
-
 }
@@ -1,9 +1,9 @@
 description = "Spring Context Indexer"

 dependencies {
-	testImplementation(project(":spring-context"))
-	testImplementation("javax.inject:javax.inject")
-	testImplementation("javax.annotation:javax.annotation-api")
-	testImplementation("javax.transaction:javax.transaction-api")
-	testImplementation("org.eclipse.persistence:javax.persistence")
+	testCompile(project(":spring-context"))
+	testCompile("javax.inject:javax.inject")
+	testCompile("javax.annotation:javax.annotation-api")
+	testCompile("javax.transaction:javax.transaction-api")
+	testCompile("org.eclipse.persistence:javax.persistence")
 }
@@ -1,9 +1,9 @@
 description = "Spring Context Support"

 dependencies {
-	api(project(":spring-beans"))
-	api(project(":spring-context"))
-	api(project(":spring-core"))
+	compile(project(":spring-beans"))
+	compile(project(":spring-context"))
+	compile(project(":spring-core"))
 	optional(project(":spring-jdbc"))  // for Quartz support
 	optional(project(":spring-tx"))  // for Quartz support
 	optional("javax.activation:javax.activation-api")
@@ -14,18 +14,18 @@ dependencies {
 	optional("org.quartz-scheduler:quartz")
 	optional("org.codehaus.fabric3.api:commonj")
 	optional("org.freemarker:freemarker")
-	testImplementation(project(":spring-context"))
-	testImplementation(testFixtures(project(":spring-beans")))
-	testImplementation(testFixtures(project(":spring-context")))
-	testImplementation(testFixtures(project(":spring-core")))
-	testImplementation(testFixtures(project(":spring-tx")))
-	testImplementation("org.hsqldb:hsqldb")
-	testImplementation("org.hibernate:hibernate-validator")
-	testImplementation("javax.annotation:javax.annotation-api")
-	testRuntimeOnly("org.ehcache:jcache")
-	testRuntimeOnly("org.ehcache:ehcache")
-	testRuntimeOnly("org.glassfish:javax.el")
-	testRuntimeOnly("com.sun.mail:javax.mail")
+	testCompile(project(":spring-context"))
+	testCompile(testFixtures(project(":spring-beans")))
+	testCompile(testFixtures(project(":spring-context")))
+	testCompile(testFixtures(project(":spring-core")))
+	testCompile(testFixtures(project(":spring-tx")))
+	testCompile("org.hsqldb:hsqldb")
+	testCompile("org.hibernate:hibernate-validator")
+	testCompile("javax.annotation:javax.annotation-api")
+	testRuntime("org.ehcache:jcache")
+	testRuntime("org.ehcache:ehcache")
+	testRuntime("org.glassfish:javax.el")
+	testRuntime("com.sun.mail:javax.mail")
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation("org.assertj:assertj-core")
 	testFixturesImplementation("org.mockito:mockito-core")
@@ -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
@@ -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...
@@ -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() {
@@ -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>

@@ -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>

@@ -4,10 +4,10 @@ apply plugin: "groovy"
 apply plugin: "kotlin"

 dependencies {
-	api(project(":spring-aop"))
-	api(project(":spring-beans"))
-	api(project(":spring-core"))
-	api(project(":spring-expression"))
+	compile(project(":spring-aop"))
+	compile(project(":spring-beans"))
+	compile(project(":spring-core"))
+	compile(project(":spring-expression"))
 	optional(project(":spring-instrument"))
 	optional("javax.annotation:javax.annotation-api")
 	optional("javax.ejb:javax.ejb-api")
@@ -26,22 +26,22 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-reflect")
 	optional("org.jetbrains.kotlin:kotlin-stdlib")
 	optional("org.reactivestreams:reactive-streams")
-	testImplementation(testFixtures(project(":spring-aop")))
-	testImplementation(testFixtures(project(":spring-beans")))
-	testImplementation(testFixtures(project(":spring-core")))
-	testImplementation("io.projectreactor:reactor-core")
-	testImplementation("org.codehaus.groovy:groovy-jsr223")
-	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")
-	testRuntimeOnly("javax.xml.bind:jaxb-api")
-	testRuntimeOnly("org.glassfish:javax.el")
+	testCompile(testFixtures(project(":spring-aop")))
+	testCompile(testFixtures(project(":spring-beans")))
+	testCompile(testFixtures(project(":spring-core")))
+	testCompile("io.projectreactor:reactor-core")
+	testCompile("org.codehaus.groovy:groovy-jsr223")
+	testCompile("org.codehaus.groovy:groovy-test")
+	testCompile("org.codehaus.groovy:groovy-xml")
+	testCompile("org.apache.commons:commons-pool2")
+	testCompile("javax.inject:javax.inject-tck")
+	testCompile("org.awaitility:awaitility")
+	testRuntime("javax.xml.bind:jaxb-api")
+	testRuntime("org.glassfish:javax.el")
 	// Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central)
-	testRuntimeOnly("org.glassfish.external:opendmk_jmxremote_optional_jar")
-	testRuntimeOnly("org.javamoney:moneta")
-	testRuntimeOnly("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
+	testRuntime("org.glassfish.external:opendmk_jmxremote_optional_jar")
+	testRuntime("org.javamoney:moneta")
+	testRuntime("org.junit.vintage:junit-vintage-engine") // for @Inject TCK
 	testFixturesApi("org.junit.jupiter:junit-jupiter-api")
 	testFixturesImplementation(testFixtures(project(":spring-beans")))
 	testFixturesImplementation("com.google.code.findbugs:jsr305")
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2016 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,11 +38,9 @@ import org.springframework.core.annotation.AliasFor;
 * replace the default one (see {@link #keyGenerator}).
 *
 * <p>If no value is found in the cache for the computed key, the target method
- * will be invoked and the returned value will be stored in the associated cache.
- * Note that {@link java.util.Optional} return types are unwrapped automatically.
- * If an {@code Optional} value is {@linkplain java.util.Optional#isPresent()
- * present}, it will be stored in the associated cache. If an {@code Optional}
- * value is not present, {@code null} will be stored in the associated cache.
+ * will be invoked and the returned value stored in the associated cache. Note
+ * that Java8's {@code Optional} return types are automatically handled and its
+ * content is stored in the cache if present.
 *
 * <p>This annotation may be used as a <em>meta-annotation</em> to create custom
 * <em>composed annotations</em> with attribute overrides.
@@ -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));
 			}
 		}

@@ -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.
@@ -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) {
@@ -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");
@@ -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;
+	}
+
 }
@@ -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;
 * &#064;Configuration
 * public class AppConfig {
 *
- *     &#064;Autowired Environment env;
+ *     &#064Autowired Environment env;
 *
 *     &#064;Bean
 *     public MyBean myBean() {
@@ -149,7 +149,7 @@ import org.springframework.stereotype.Component;
 * &#064;PropertySource("classpath:/com/acme/app.properties")
 * public class AppConfig {
 *
- *     &#064;Inject Environment env;
+ *     &#064Inject Environment env;
 *
 *     &#064;Bean
 *     public MyBean myBean() {
@@ -170,7 +170,7 @@ import org.springframework.stereotype.Component;
 * &#064;PropertySource("classpath:/com/acme/app.properties")
 * public class AppConfig {
 *
- *     &#064;Value("${bean.name}") String beanName;
+ *     &#064Value("${bean.name}") String beanName;
 *
 *     &#064;Bean
 *     public MyBean myBean() {
@@ -297,7 +297,7 @@ import org.springframework.stereotype.Component;
 * &#064;ImportResource("classpath:/com/acme/database-config.xml")
 * public class AppConfig {
 *
- *     &#064;Inject DataSource dataSource; // from XML
+ *     &#064Inject DataSource dataSource; // from XML
 *
 *     &#064;Bean
 *     public MyBean myBean() {
@@ -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());
@@ -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;
 * &#064;EnableAspectJAutoProxy
 * public class AppConfig {
 *
- *     // no explicit &#064;Bean definitions required
+ *     // no explicit &#064Bean definitions required
 * }</pre>
 *
 * <b>Note: {@code @EnableAspectJAutoProxy} applies to its local application context only,
@@ -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
@@ -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;
-	}
-
-}
@@ -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);
 	}
@@ -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);
 			}
@@ -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);
@@ -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) {                  // &lt;--- 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
 *         }
 *     }
@@ -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
@@ -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
--- a/Show More
+++ b/Show More