Release v5.3.4

2026-06-08 17:33:33 +00:00 · 2021-02-16 10:43:46 +00:00
458 changed files with 4223 additions and 9882 deletions
@@ -41,6 +41,3 @@ out
 test-output
 atlassian-ide-plugin.xml
 .gradletasknamecache
-
-# VS Code
-.vscode/
@@ -125,7 +125,10 @@ The reference documentation is in the [src/docs/asciidoc](src/docs/asciidoc) dir
 edit source files, and submit directly from GitHub.

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

-Asciidoctor also supports live editing. For more details see
-[AsciiDoc Tooling](https://docs.asciidoctor.org/asciidoctor/latest/tooling/).
+Asciidoctor also supports live editing. For more details read
+[Editing AsciiDoc with Live Preview](https://asciidoctor.org/docs/editing-asciidoc-with-live-preview/).
+Note that if you choose the
+[System Monitor](https://asciidoctor.org/docs/editing-asciidoc-with-live-preview/#using-a-system-monitor)
+option, you can find a Guardfile under `src/docs/asciidoc`.
@@ -25,10 +25,6 @@ See the [Micro-Benchmarks](https://github.com/spring-projects/spring-framework/w

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

-## Continuous Integration Builds
-
-Information regarding CI builds can be found in the [Spring Framework Concourse pipeline](ci/README.adoc) documentation.
-
 ## Stay in Touch

 Follow [@SpringCentral](https://twitter.com/springcentral), [@SpringFramework](https://twitter.com/springframework), and its [team members](https://twitter.com/springframework/lists/team/members) on Twitter. In-depth articles can be found at [The Spring Blog](https://spring.io/blog/), and releases are announced via our [news feed](https://spring.io/blog/category/news).
@@ -1,7 +1,7 @@
 plugins {
 	id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
 	id 'io.spring.nohttp' version '0.0.5.RELEASE'
-	id 'org.jetbrains.kotlin.jvm' version '1.5.10' apply false
+	id 'org.jetbrains.kotlin.jvm' version '1.4.30' 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'
@@ -9,9 +9,8 @@ plugins {
 	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.10" apply false
-	id "org.unbroken-dome.xjc" version '2.0.0' apply false
+	id "me.champeau.gradle.jmh" version "0.5.2" apply false
+	id "org.jetbrains.kotlin.plugin.serialization" version "1.4.30" apply false
 }

 ext {
@@ -27,19 +26,18 @@ configure(allprojects) { project ->

 	dependencyManagement {
 		imports {
-			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.3"
-			mavenBom "io.netty:netty-bom:4.1.65.Final"
-			mavenBom "io.projectreactor:reactor-bom:2020.0.7"
-			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR10"
+			mavenBom "com.fasterxml.jackson:jackson-bom:2.12.1"
+			mavenBom "io.netty:netty-bom:4.1.59.Final"
+			mavenBom "io.projectreactor:reactor-bom:2020.0.4"
+			mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR8"
 			mavenBom "io.rsocket:rsocket-bom:1.1.0"
-			mavenBom "org.eclipse.jetty:jetty-bom:9.4.41.v20210516"
-			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.5.10"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.5.0"
-			mavenBom "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.2.1"
-			mavenBom "org.junit:junit-bom:5.7.2"
+			mavenBom "org.eclipse.jetty:jetty-bom:9.4.36.v20210114"
+			mavenBom "org.jetbrains.kotlin:kotlin-bom:1.4.30"
+			mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.4.2"
+			mavenBom "org.junit:junit-bom:5.7.1"
 		}
 		dependencies {
-			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.1') {
+			dependencySet(group: 'org.apache.logging.log4j', version: '2.14.0') {
 				entry 'log4j-api'
 				entry 'log4j-core'
 				entry 'log4j-jul'
@@ -56,7 +54,7 @@ configure(allprojects) { project ->
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
 			}
-			dependencySet(group: 'org.codehaus.groovy', version: '3.0.8') {
+			dependencySet(group: 'org.codehaus.groovy', version: '3.0.7') {
 				entry 'groovy'
 				entry 'groovy-jsr223'
 				entry 'groovy-templates'  // requires findbugs for warning-free compilation
@@ -67,18 +65,18 @@ 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.0.13"
+			dependency "io.reactivex.rxjava3:rxjava:3.0.10"
 			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") {
+			dependency "com.fasterxml:aalto-xml:1.2.2"
+			dependency("com.fasterxml.woodstox:woodstox-core:6.2.3") {
 				exclude group: "stax", name: "stax-api"
 			}
-			dependency "com.google.code.gson:gson:2.8.7"
-			dependency "com.google.protobuf:protobuf-java-util:3.17.2"
+			dependency "com.google.code.gson:gson:2.8.6"
+			dependency "com.google.protobuf:protobuf-java-util:3.14.0"
 			dependency "com.googlecode.protobuf-java-format:protobuf-java-format:1.4"
-			dependency("com.thoughtworks.xstream:xstream:1.4.17") {
+			dependency("com.thoughtworks.xstream:xstream:1.4.15") {
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
@@ -91,16 +89,20 @@ configure(allprojects) { project ->
 				entry 'jibx-run'
 			}
 			dependency "org.ogce:xpp3:1.1.6"
-			dependency "org.yaml:snakeyaml:1.28"
+			dependency "org.yaml:snakeyaml:1.27"
+			dependencySet(group: 'org.jetbrains.kotlinx', version: '1.0.0') {
+				entry 'kotlinx-serialization-core'
+				entry 'kotlinx-serialization-json'
+			}

 			dependency "com.h2database:h2:1.4.200"
-			dependency "com.github.ben-manes.caffeine:caffeine:2.9.1"
-			dependency "com.github.librepdf:openpdf:1.3.26"
+			dependency "com.github.ben-manes.caffeine:caffeine:2.8.8"
+			dependency "com.github.librepdf:openpdf:1.3.25"
 			dependency "com.rometools:rome:1.15.0"
 			dependency "commons-io:commons-io:2.5"
 			dependency "io.vavr:vavr:0.10.3"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
-			dependencySet(group: 'org.apache.activemq', version: '5.16.2') {
+			dependencySet(group: 'org.apache.activemq', version: '5.16.0') {
 				entry 'activemq-broker'
 				entry('activemq-kahadb-store') {
 					exclude group: "org.springframework", name: "spring-context"
@@ -115,30 +117,30 @@ configure(allprojects) { project ->
 			}
 			dependency "org.apache.poi:poi-ooxml:4.1.2"
 			dependency "org.apache-extras.beanshell:bsh:2.0b6"
-			dependency "org.freemarker:freemarker:2.3.31"
-			dependency "org.hsqldb:hsqldb:2.5.2"
+			dependency "org.freemarker:freemarker:2.3.30"
+			dependency "org.hsqldb:hsqldb:2.5.1"
 			dependency "org.quartz-scheduler:quartz:2.3.2"
 			dependency "org.codehaus.fabric3.api:commonj:1.1.0"
 			dependency "net.sf.ehcache:ehcache:2.10.6"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core:5.4.32.Final"
+			dependency "org.hibernate:hibernate-core:5.4.28.Final"
 			dependency "org.hibernate:hibernate-validator:6.2.0.Final"
 			dependency "org.webjars:webjars-locator-core:0.46"
 			dependency "org.webjars:underscorejs:1.8.3"

-			dependencySet(group: 'org.apache.tomcat', version: '9.0.45') {
+			dependencySet(group: 'org.apache.tomcat', version: '9.0.43') {
 				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.45') {
+			dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.43') {
 				entry 'tomcat-embed-core'
 				entry 'tomcat-embed-websocket'
 			}
-			dependencySet(group: 'io.undertow', version: '2.2.8.Final') {
+			dependencySet(group: 'io.undertow', version: '2.2.4.Final') {
 				entry 'undertow-core'
 				entry('undertow-websockets-jsr') {
 					exclude group: "org.jboss.spec.javax.websocket", name: "jboss-websocket-api_1.1_spec"
@@ -159,11 +161,11 @@ configure(allprojects) { project ->
 			dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency 'org.apache.httpcomponents.client5:httpclient5:5.1'
-			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.1.1'
-			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.8"
+			dependency 'org.apache.httpcomponents.client5:httpclient5:5.0.3'
+			dependency 'org.apache.httpcomponents.core5:httpcore5-reactive:5.0.3'
+			dependency "org.eclipse.jetty:jetty-reactive-httpclient:1.1.5"

-			dependency "org.jruby:jruby:9.2.17.0"
+			dependency "org.jruby:jruby:9.2.13.0"
 			dependency "org.python:jython-standalone:2.7.1"
 			dependency "org.mozilla:rhino:1.7.11"

@@ -186,7 +188,7 @@ configure(allprojects) { project ->
 			dependency("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1") {
 				exclude group: "junit", name: "junit"
 			}
-			dependency "org.testng:testng:7.4.0"
+			dependency "org.testng:testng:7.3.0"
 			dependency "org.hamcrest:hamcrest:2.1"
 			dependency "org.awaitility:awaitility:3.1.6"
 			dependency "org.assertj:assertj-core:3.19.0"
@@ -196,7 +198,7 @@ configure(allprojects) { project ->
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
 			}
-			dependencySet(group: 'org.mockito', version: '3.11.0') {
+			dependencySet(group: 'org.mockito', version: '3.7.7') {
 				entry('mockito-core') {
 					exclude group: "org.hamcrest", name: "hamcrest-core"
 				}
@@ -204,10 +206,10 @@ configure(allprojects) { project ->
 			}
 			dependency "io.mockk:mockk:1.10.2"

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

 			dependencySet(group: 'org.apache.tiles', version: '3.0.8') {
@@ -307,21 +309,23 @@ configure([rootProject] + javaProjects) { project ->
 	apply plugin: "java-test-fixtures"
 	apply plugin: "checkstyle"
 	apply plugin: 'org.springframework.build.compile'
-	apply from: "${rootDir}/gradle/toolchains.gradle"
+	apply from: "${rootDir}/gradle/custom-java-home.gradle"
 	apply from: "${rootDir}/gradle/ide.gradle"

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

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

@@ -375,10 +379,10 @@ configure([rootProject] + javaProjects) { project ->
 			"https://fasterxml.github.io/jackson-core/javadoc/2.10/",
 			"https://fasterxml.github.io/jackson-databind/javadoc/2.10/",
 			"https://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.10/",
-			"https://hc.apache.org/httpcomponents-client-5.1.x/current/httpclient5/apidocs/",
+			"https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/",
 			"https://projectreactor.io/docs/test/release/api/",
 			"https://junit.org/junit4/javadoc/4.13.2/",
-			"https://junit.org/junit5/docs/5.7.2/api/"
+			"https://junit.org/junit5/docs/5.7.1/api/"
 	] as String[]
 }

@@ -8,10 +8,16 @@ They are declared in the `build.gradle` file in this folder.
 ### Compiler conventions

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

 ## Build Plugins

-### Optional dependencies
+## Optional dependencies

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

-### API Diff
+## API Diff

 This plugin uses the [Gradle JApiCmp](https://github.com/melix/japicmp-gradle-plugin) plugin
 to generate API Diff reports for each Spring Framework module. This plugin is applied once on the root
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,21 +20,31 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

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

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

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

 	private static final List<String> TEST_COMPILER_ARGS;
@@ -59,7 +69,7 @@ public class CompilerConventionsPlugin implements Plugin<Project> {

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

 	/**
@@ -69,6 +79,15 @@ public class CompilerConventionsPlugin implements Plugin<Project> {
 	 */
 	private void applyJavaCompileConventions(Project project) {
 		JavaPluginConvention java = project.getConvention().getPlugin(JavaPluginConvention.class);
+		if (project.hasProperty(JAVA_SOURCE_VERSION_PROPERTY)) {
+			JavaVersion javaSourceVersion = JavaVersion.toVersion(project.property(JAVA_SOURCE_VERSION_PROPERTY));
+			java.setSourceCompatibility(javaSourceVersion);
+		}
+		else {
+			java.setSourceCompatibility(DEFAULT_COMPILER_VERSION);
+		}
+		java.setTargetCompatibility(DEFAULT_COMPILER_VERSION);
+
 		project.getTasks().withType(JavaCompile.class)
 				.matching(compileTask -> compileTask.getName().equals(JavaPlugin.COMPILE_JAVA_TASK_NAME))
 				.forEach(compileTask -> {
@@ -1,8 +1,7 @@
 == Spring Framework Concourse pipeline

-The Spring Framework uses https://concourse-ci.org/[Concourse] for its CI build and other automated tasks.
-The Spring team has a dedicated Concourse instance available at https://ci.spring.io with a build pipeline
-for https://ci.spring.io/teams/spring-framework/pipelines/spring-framework-5.3.x[Spring Framework 5.3.x].
+The Spring Framework is using https://concourse-ci.org/[Concourse] for its CI build and other automated tasks.
+The Spring team has a dedicated Concourse instance available at https://ci.spring.io.

 === Setting up your development environment

@@ -26,17 +25,13 @@ spring                https://ci.spring.io  spring-framework      Wed, 25 Mar 20
 ----

 === Pipeline configuration and structure
-
 The build pipelines are described in `pipeline.yml` file.
-
 This file is listing Concourse resources, i.e. build inputs and outputs such as container images, artifact repositories, source repositories, notification services, etc.
-
 It also describes jobs (a job is a sequence of inputs, tasks and outputs); jobs are organized by groups.

 The `pipeline.yml` definition contains `((parameters))` which are loaded from the `parameters.yml` file or from our https://docs.cloudfoundry.org/credhub/[credhub instance].

 You'll find in this folder the following resources:
-
 * `pipeline.yml` the build pipeline
 * `parameters.yml` the build parameters used for the pipeline
 * `images/` holds the container images definitions used in this pipeline
@@ -46,7 +41,6 @@ You'll find in this folder the following resources:
 === Updating the build pipeline

 Updating files on the repository is not enough to update the build pipeline, as changes need to be applied.
-
 The pipeline can be deployed using the following command:

 [source]
@@ -54,4 +48,4 @@ The pipeline can be deployed using the following command:
 $ fly -t spring set-pipeline -p spring-framework-5.3.x -c ci/pipeline.yml -l ci/parameters.yml
 ----

-NOTE: This assumes that you have credhub integration configured with the appropriate secrets.
+NOTE: This assumes that you have credhub integration configured with the appropriate secrets.
@@ -1,10 +1,9 @@
 logging:
  level:
    io.spring.concourse: DEBUG
+distribute:
+  optional-deployments:
+    - '.*\.zip'
 spring:
  main:
    banner-mode: off
-sonatype:
-  exclude:
-    - 'build-info\.json'
-    - '.*\.zip'
@@ -12,27 +12,20 @@ ln -fs /usr/share/zoneinfo/UTC /etc/localtime
 dpkg-reconfigure --frontend noninteractive tzdata
 rm -rf /var/lib/apt/lists/*

-curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.4/concourse-java.sh > /opt/concourse-java.sh
+curl https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.3/concourse-java.sh > /opt/concourse-java.sh

-curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.3.2/concourse-release-scripts-0.3.2.jar
+curl --output /opt/concourse-release-scripts.jar https://repo.spring.io/release/io/spring/concourse/releasescripts/concourse-release-scripts/0.2.1/concourse-release-scripts-0.2.1.jar

 ###########################################################
 # JAVA
 ###########################################################
+JDK_URL=$( ./get-jdk-url.sh $1 )

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

 ###########################################################
 # GRADLE ENTERPRISE
@@ -4,8 +4,5 @@ ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
 RUN ./setup.sh java8

-ENV JAVA_HOME /opt/openjdk/java8
-ENV JDK11 /opt/openjdk/java11
-ENV JDK15 /opt/openjdk/java15
-
+ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
@@ -0,0 +1,8 @@
+FROM ubuntu:focal-20210119
+
+ADD setup.sh /setup.sh
+ADD get-jdk-url.sh /get-jdk-url.sh
+RUN ./setup.sh java11
+
+ENV JAVA_HOME /opt/openjdk
+ENV PATH $JAVA_HOME/bin:$PATH
@@ -0,0 +1,8 @@
+FROM ubuntu:focal-20210119
+
+ADD setup.sh /setup.sh
+ADD get-jdk-url.sh /get-jdk-url.sh
+RUN ./setup.sh java15
+
+ENV JAVA_HOME /opt/openjdk
+ENV PATH $JAVA_HOME/bin:$PATH
@@ -5,9 +5,10 @@ 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: "main"
-milestone: "5.3.x"
+branch: "master"
 build-name: "spring-framework"
 pipeline-name: "spring-framework"
 concourse-url: "https://ci.spring.io"
-task-timeout: 1h00m
+bintray-subject: "spring"
+bintray-repo: "jars"
+task-timeout: 1h00m
@@ -1,29 +1,21 @@
 anchors:
-  git-repo-resource-source: &git-repo-resource-source
-    uri: ((github-repo))
-    username: ((github-username))
-    password: ((github-password))
-    branch: ((branch))
-  gradle-enterprise-task-params: &gradle-enterprise-task-params
-    GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
-    GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
-    GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
-  sonatype-task-params: &sonatype-task-params
-    SONATYPE_USERNAME: ((sonatype-username))
-    SONATYPE_PASSWORD: ((sonatype-password))
-    SONATYPE_URL: ((sonatype-url))
-    SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id))
  artifactory-task-params: &artifactory-task-params
    ARTIFACTORY_SERVER: ((artifactory-server))
    ARTIFACTORY_USERNAME: ((artifactory-username))
    ARTIFACTORY_PASSWORD: ((artifactory-password))
-  build-project-task-params: &build-project-task-params
-      BRANCH: ((branch))
-      <<: *gradle-enterprise-task-params
+  bintray-task-params: &bintray-task-params
+    BINTRAY_SUBJECT: ((bintray-subject))
+    BINTRAY_REPO: ((bintray-repo))
+    BINTRAY_USERNAME: ((bintray-username))
+    BINTRAY_API_KEY: ((bintray-api-key))
  docker-resource-source: &docker-resource-source
    username: ((docker-hub-username))
    password: ((docker-hub-password))
-    tag: ((milestone))
+    tag: 5.3.x
+  gradle-enterprise-task-params: &gradle-enterprise-task-params
+    GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key))
+    GRADLE_ENTERPRISE_CACHE_USERNAME: ((gradle_enterprise_cache_user.username))
+    GRADLE_ENTERPRISE_CACHE_PASSWORD: ((gradle_enterprise_cache_user.password))
  slack-fail-params: &slack-fail-params
    text: >
      :concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>
@@ -32,6 +24,9 @@ anchors:
    silent: true
    icon_emoji: ":concourse:"
    username: concourse-ci
+  sonatype-task-params: &sonatype-task-params
+    SONATYPE_USER_TOKEN: ((sonatype-user-token))
+    SONATYPE_PASSWORD_TOKEN: ((sonatype-user-token-password))
  changelog-task-params: &changelog-task-params
    name: generated-changelog/tag
    tag: generated-changelog/tag
@@ -45,28 +40,27 @@ resource_types:
  type: registry-image
  source:
    repository: springio/artifactory-resource
-    tag: 0.0.13
+    tag: 0.0.12
 - name: github-status-resource
  type: registry-image
  source:
    repository: dpb587/github-status-resource
    tag: master
- name: pull-request
-  type: registry-image
-  source:
-    repository: teliaoss/github-pr-resource
-    tag: v0.23.0
 - name: slack-notification
  type: registry-image
  source:
    repository: cfcommunity/slack-notification-resource
    tag: latest
+
 resources:
 - name: git-repo
  type: git
  icon: github
  source:
-    <<: *git-repo-resource-source
+    uri: ((github-repo))
+    username: ((github-username))
+    password: ((github-password))
+    branch: ((branch))
 - name: every-morning
  type: time
  icon: alarm
@@ -81,12 +75,24 @@ resources:
    uri: ((github-repo))
    branch: ((branch))
    paths: ["ci/images/*"]
- name: ci-image
+- name: spring-framework-ci-image
  type: docker-image
  icon: docker
  source:
    <<: *docker-resource-source
-    repository: ((docker-hub-organization))/spring-framework-ci
+    repository: ((docker-hub-organization))/spring-framework-ci-image
+- name: spring-framework-jdk11-ci-image
+  type: docker-image
+  icon: docker
+  source:
+    <<: *docker-resource-source
+    repository: ((docker-hub-organization))/spring-framework-jdk11-ci-image
+- name: spring-framework-jdk15-ci-image
+  type: docker-image
+  icon: docker
+  source:
+    <<: *docker-resource-source
+    repository: ((docker-hub-organization))/spring-framework-jdk15-ci-image
 - name: artifactory-repo
  type: artifactory-resource
  icon: package-variant
@@ -95,14 +101,6 @@ resources:
    username: ((artifactory-username))
    password: ((artifactory-password))
    build_name: ((build-name))
- name: git-pull-request
-  type: pull-request
-  icon: source-pull
-  source:
-    access_token: ((github-ci-pull-request-token))
-    repository: ((github-repo-name))
-    base_branch: ((branch))
-    ignore_paths: ["ci/*"]
 - name: repo-status-build
  type: github-status-resource
  icon: eye-check-outline
@@ -149,33 +147,43 @@ resources:
    repository: spring-framework
    access_token: ((github-ci-release-token))
    pre_release: false
+
 jobs:
- name: build-ci-images
+- name: build-spring-framework-ci-images
  plan:
  - get: ci-images-git-repo
    trigger: true
  - in_parallel:
-    - put: ci-image
+    - put: spring-framework-ci-image
      params:
        build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/ci-image/Dockerfile
+        dockerfile: ci-images-git-repo/ci/images/spring-framework-ci-image/Dockerfile
+    - put: spring-framework-jdk11-ci-image
+      params:
+        build: ci-images-git-repo/ci/images
+        dockerfile: ci-images-git-repo/ci/images/spring-framework-jdk11-ci-image/Dockerfile
+    - put: spring-framework-jdk15-ci-image
+      params:
+        build: ci-images-git-repo/ci/images
+        dockerfile: ci-images-git-repo/ci/images/spring-framework-jdk15-ci-image/Dockerfile
 - name: build
  serial: true
  public: true
  plan:
-  - get: ci-image
+  - get: spring-framework-ci-image
  - get: git-repo
    trigger: true
  - put: repo-status-build
    params: { state: "pending", commit: "git-repo" }
  - do:
    - task: build-project
-      image: ci-image
-      file: git-repo/ci/tasks/build-project.yml
      privileged: true
      timeout: ((task-timeout))
+      image: spring-framework-ci-image
+      file: git-repo/ci/tasks/build-project.yml
      params:
-        <<: *build-project-task-params
+        BRANCH: ((branch))
+        <<: *gradle-enterprise-task-params
    on_failure:
      do:
      - put: repo-status-build
@@ -187,8 +195,6 @@ jobs:
    params: { state: "success", commit: "git-repo" }
  - put: artifactory-repo
    params: &artifactory-params
-      signing_key: ((signing-key))
-      signing_passphrase: ((signing-passphrase))
      repo: libs-snapshot-local
      folder: distribution-repository
      build_uri: "https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}"
@@ -220,7 +226,7 @@ jobs:
  serial: true
  public: true
  plan:
-  - get: ci-image
+  - get: spring-framework-jdk11-ci-image
  - get: git-repo
  - get: every-morning
    trigger: true
@@ -228,13 +234,13 @@ jobs:
    params: { state: "pending", commit: "git-repo" }
  - do:
    - task: check-project
-      image: ci-image
-      file: git-repo/ci/tasks/check-project.yml
      privileged: true
      timeout: ((task-timeout))
+      image: spring-framework-jdk11-ci-image
+      file: git-repo/ci/tasks/check-project.yml
      params:
-        TEST_TOOLCHAIN: 11
-        <<: *build-project-task-params
+        BRANCH: ((branch))
+        <<: *gradle-enterprise-task-params
    on_failure:
      do:
      - put: repo-status-jdk11-build
@@ -248,21 +254,21 @@ jobs:
  serial: true
  public: true
  plan:
-    - get: ci-image
+    - get: spring-framework-jdk15-ci-image
    - get: git-repo
    - get: every-morning
      trigger: true
    - put: repo-status-jdk15-build
      params: { state: "pending", commit: "git-repo" }
    - do:
-      - task: check-project
-        image: ci-image
-        file: git-repo/ci/tasks/check-project.yml
-        privileged: true
-        timeout: ((task-timeout))
-        params:
-          TEST_TOOLCHAIN: 15
-          <<: *build-project-task-params
+        - task: check-project
+          privileged: true
+          timeout: ((task-timeout))
+          image: spring-framework-jdk15-ci-image
+          file: git-repo/ci/tasks/check-project.yml
+          params:
+            BRANCH: ((branch))
+            <<: *gradle-enterprise-task-params
      on_failure:
        do:
          - put: repo-status-jdk15-build
@@ -272,45 +278,14 @@ jobs:
              <<: *slack-fail-params
    - put: repo-status-jdk15-build
      params: { state: "success", commit: "git-repo" }
- name: build-pull-requests
-  serial: true
-  public: true
-  plan:
-    - get: ci-image
-    - get: git-repo
-      resource: git-pull-request
-      trigger: true
-      version: every
-    - do:
-      - put: git-pull-request
-        params:
-          path: git-repo
-          status: pending
-      - task: build-pr
-        image: ci-image
-        file: git-repo/ci/tasks/build-pr.yml
-        privileged: true
-        timeout: ((task-timeout))
-        params:
-          <<: *build-project-task-params
-      on_success:
-        put: git-pull-request
-        params:
-          path: git-repo
-          status: success
-      on_failure:
-        put: git-pull-request
-        params:
-          path: git-repo
-          status: failure
 - name: stage-milestone
  serial: true
  plan:
-    - get: ci-image
+    - get: spring-framework-ci-image
    - get: git-repo
      trigger: false
    - task: stage
-      image: ci-image
+      image: spring-framework-ci-image
      file: git-repo/ci/tasks/stage-version.yml
      params:
        RELEASE_TYPE: M
@@ -325,7 +300,7 @@ jobs:
 - name: promote-milestone
  serial: true
  plan:
-    - get: ci-image
+    - get: spring-framework-ci-image
    - get: git-repo
      trigger: false
    - get: artifactory-repo
@@ -335,7 +310,7 @@ jobs:
        download_artifacts: false
        save_build_info: true
    - task: promote
-      image: ci-image
+      image: spring-framework-ci-image
      file: git-repo/ci/tasks/promote-version.yml
      params:
        RELEASE_TYPE: M
@@ -351,11 +326,11 @@ jobs:
 - name: stage-rc
  serial: true
  plan:
-    - get: ci-image
+    - get: spring-framework-ci-image
    - get: git-repo
      trigger: false
    - task: stage
-      image: ci-image
+      image: spring-framework-ci-image
      file: git-repo/ci/tasks/stage-version.yml
      params:
        RELEASE_TYPE: RC
@@ -370,7 +345,7 @@ jobs:
 - name: promote-rc
  serial: true
  plan:
-    - get: ci-image
+    - get: spring-framework-ci-image
    - get: git-repo
      trigger: false
    - get: artifactory-repo
@@ -380,7 +355,7 @@ jobs:
        download_artifacts: false
        save_build_info: true
    - task: promote
-      image: ci-image
+      image: spring-framework-ci-image
      file: git-repo/ci/tasks/promote-version.yml
      params:
        RELEASE_TYPE: RC
@@ -396,11 +371,11 @@ jobs:
 - name: stage-release
  serial: true
  plan:
-    - get: ci-image
+    - get: spring-framework-ci-image
    - get: git-repo
      trigger: false
    - task: stage
-      image: ci-image
+      image: spring-framework-ci-image
      file: git-repo/ci/tasks/stage-version.yml
      params:
        RELEASE_TYPE: RELEASE
@@ -415,26 +390,26 @@ jobs:
 - name: promote-release
  serial: true
  plan:
-    - get: ci-image
+    - get: spring-framework-ci-image
    - get: git-repo
      trigger: false
    - get: artifactory-repo
      trigger: false
      passed: [stage-release]
      params:
-        download_artifacts: true
+        download_artifacts: false
        save_build_info: true
    - task: promote
-      image: ci-image
+      image: spring-framework-ci-image
      file: git-repo/ci/tasks/promote-version.yml
      params:
        RELEASE_TYPE: RELEASE
        <<: *artifactory-task-params
-        <<: *sonatype-task-params
- name: create-github-release
+        <<: *bintray-task-params
+- name: sync-to-maven-central
  serial: true
  plan:
-    - get: ci-image
+    - get: spring-framework-ci-image
    - get: git-repo
    - get: artifactory-repo
      trigger: true
@@ -442,6 +417,12 @@ jobs:
      params:
        download_artifacts: false
        save_build_info: true
+    - task: sync-to-maven-central
+      image: spring-framework-ci-image
+      file: git-repo/ci/tasks/sync-to-maven-central.yml
+      params:
+        <<: *bintray-task-params
+        <<: *sonatype-task-params
    - task: generate-changelog
      file: git-repo/ci/tasks/generate-changelog.yml
      params:
@@ -455,8 +436,6 @@ groups:
 - name: "builds"
  jobs: ["build", "jdk11-build", "jdk15-build"]
 - name: "releases"
-  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "create-github-release"]
+  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone","promote-rc", "promote-release", "sync-to-maven-central"]
 - name: "ci-images"
-  jobs: ["build-ci-images"]
- name: "pull-requests"
-  jobs: [ "build-pull-requests" ]
+  jobs: ["build-spring-framework-ci-images"]
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-source $(dirname $0)/common.sh
-
-pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 check
-popd > /dev/null
@@ -4,6 +4,5 @@ set -e
 source $(dirname $0)/common.sh

 pushd git-repo > /dev/null
-./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false -Porg.gradle.java.installations.fromEnv=JDK11,JDK15 \
-  -PmainToolchain=${MAIN_TOOLCHAIN} -PtestToolchain=${TEST_TOOLCHAIN} --no-daemon --max-workers=4 check
+./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 check
 popd > /dev/null
@@ -2,7 +2,7 @@
 set -e

 CONFIG_DIR=git-repo/ci/config
-version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
+version=$( cat version/version )

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

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

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

 echo "Promotion complete"
 echo $version > version/version
@@ -1,19 +0,0 @@
---
-platform: linux
-inputs:
- name: git-repo
-caches:
- path: gradle
-params:
-  BRANCH:
-  CI: true
-  GRADLE_ENTERPRISE_ACCESS_KEY:
-  GRADLE_ENTERPRISE_CACHE_USERNAME:
-  GRADLE_ENTERPRISE_CACHE_PASSWORD:
-  GRADLE_ENTERPRISE_URL: https://ge.spring.io
-run:
-  path: bash
-  args:
-    - -ec
-    - |
-      ${PWD}/git-repo/ci/scripts/build-pr.sh
@@ -10,8 +10,6 @@ caches:
 params:
  BRANCH:
  CI: true
-  MAIN_TOOLCHAIN:
-  TEST_TOOLCHAIN:
  GRADLE_ENTERPRISE_ACCESS_KEY:
  GRADLE_ENTERPRISE_CACHE_USERNAME:
  GRADLE_ENTERPRISE_CACHE_PASSWORD:
@@ -1,13 +1,13 @@
 ---
 platform: linux
 image_resource:
-  type: registry-image
+  type: docker-image
  source:
    repository: springio/github-changelog-generator
-    tag: '0.0.6'
+    tag: '0.0.4'
 inputs:
 - name: git-repo
- name: artifactory-repo
+- name: version
 outputs:
 - name: generated-changelog
 params:
@@ -10,9 +10,9 @@ params:
  ARTIFACTORY_SERVER:
  ARTIFACTORY_USERNAME:
  ARTIFACTORY_PASSWORD:
-  SONATYPE_USER:
-  SONATYPE_PASSWORD:
-  SONATYPE_URL:
-  SONATYPE_STAGING_PROFILE_ID:
+  BINTRAY_SUBJECT:
+  BINTRAY_REPO:
+  BINTRAY_USERNAME:
+  BINTRAY_API_KEY:
 run:
  path: git-repo/ci/scripts/promote-version.sh
@@ -0,0 +1,16 @@
+---
+platform: linux
+inputs:
+- name: git-repo
+- name: artifactory-repo
+outputs:
+- name: version
+params:
+  BINTRAY_REPO:
+  BINTRAY_SUBJECT:
+  BINTRAY_USERNAME:
+  BINTRAY_API_KEY:
+  SONATYPE_USER_TOKEN:
+  SONATYPE_PASSWORD_TOKEN:
+run:
+  path: git-repo/ci/scripts/sync-to-maven-central.sh
@@ -1,4 +1,4 @@
-version=5.3.8
+version=5.3.4
 org.gradle.jvmargs=-Xmx1536M
 org.gradle.caching=true
 org.gradle.parallel=true
@@ -0,0 +1,80 @@
+// -----------------------------------------------------------------------------
+//
+// This script adds support for the following two JVM system properties
+// that control the build for alternative JDKs (i.e., a JDK other than
+// the one used to launch the Gradle process).
+//
+// - customJavaHome: absolute path to the alternate JDK installation to
+//     use to compile Java code and execute tests. This system property
+//     is also used in spring-oxm.gradle to determine whether JiBX is
+//     supported.
+//
+// - customJavaSourceVersion: Java version supplied to the `--release`
+//     command line flag to control the Java source and target
+//     compatibility version. Supported versions include 9 or higher.
+//     Do not set this system property if Java 8 should be used.
+//
+// Examples:
+//
+// ./gradlew -DcustomJavaHome=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home test
+//
+// ./gradlew --no-build-cache -DcustomJavaHome=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home test
+//
+// ./gradlew -DcustomJavaHome=/Library/Java/JavaVirtualMachines/jdk-14.jdk/Contents/Home -DcustomJavaSourceVersion=14 test
+//
+//
+// Credits: inspired by work from Marc Philipp and Stephane Nicoll
+//
+// -----------------------------------------------------------------------------
+
+import org.gradle.internal.os.OperatingSystem
+// import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile
+
+def customJavaHome = System.getProperty("customJavaHome")
+
+if (customJavaHome) {
+	def customJavaHomeDir = new File(customJavaHome)
+	def customJavaSourceVersion = System.getProperty("customJavaSourceVersion")
+
+	tasks.withType(JavaCompile) {
+		logger.info("Java home for " + it.name + " task in " + project.name + ": " + customJavaHomeDir)
+		options.forkOptions.javaHome = customJavaHomeDir
+		inputs.property("customJavaHome", customJavaHome)
+		if (customJavaSourceVersion) {
+			options.compilerArgs += [ "--release", customJavaSourceVersion]
+			inputs.property("customJavaSourceVersion", customJavaSourceVersion)
+		}
+	}
+
+	tasks.withType(GroovyCompile) {
+		logger.info("Java home for " + it.name + " task in " + project.name + ": " + customJavaHomeDir)
+		options.forkOptions.javaHome = customJavaHomeDir
+		inputs.property("customJavaHome", customJavaHome)
+		if (customJavaSourceVersion) {
+			options.compilerArgs += [ "--release", customJavaSourceVersion]
+			inputs.property("customJavaSourceVersion", customJavaSourceVersion)
+		}
+	}
+
+	/*
+	tasks.withType(KotlinJvmCompile) {
+		logger.info("Java home for " + it.name + " task in " + project.name + ": " + customJavaHome)
+		kotlinOptions.jdkHome = customJavaHomeDir
+		inputs.property("customJavaHome", customJavaHome)
+	}
+	*/
+
+	tasks.withType(Test) {
+		def javaExecutable = customJavaHome + "/bin/java"
+		if (OperatingSystem.current().isWindows()) {
+			javaExecutable += ".exe"
+		}
+		logger.info("Java executable for " + it.name + " task in " + project.name + ": " + javaExecutable)
+		executable = javaExecutable
+		inputs.property("customJavaHome", customJavaHome)
+		if (customJavaSourceVersion) {
+			inputs.property("customJavaSourceVersion", customJavaSourceVersion)
+		}
+	}
+
+}
@@ -143,8 +143,7 @@ asciidoctorj {
 			'highlightjs-theme': 'googlecode',
 			stylesdir: 'css/',
 			stylesheet: 'stylesheet.css',
-			'spring-version': project.version,
-			'spring-framework-main-code': 'https://github.com/spring-projects/spring-framework/tree/main'
+			'spring-version': project.version
 	])
 }

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

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

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

 plugins {
-	id "com.gradle.enterprise" version "3.6.1"
+	id "com.gradle.enterprise" version "3.5.1"
 	id "io.spring.ge.conventions" version "0.0.7"
 }

@@ -45,6 +45,12 @@ rootProject.children.each {project ->
 settings.gradle.projectsLoaded {
 	gradleEnterprise {
 		buildScan {
+			if (settings.gradle.rootProject.hasProperty('customJavaHome')) {
+				value("Custom JAVA_HOME", settings.gradle.rootProject.getProperty('customJavaHome'))
+			}
+			if (settings.gradle.rootProject.hasProperty('customJavaSourceVersion')) {
+				value("Custom Java Source Version", settings.gradle.rootProject.getProperty('customJavaSourceVersion'))
+			}
 			File buildDir = settings.gradle.rootProject.getBuildDir()
 			buildDir.mkdirs()
 			new File(buildDir, "build-scan-uri.txt").text = "(build scan not generated)"
@@ -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.
@@ -26,7 +26,7 @@ import org.aopalliance.aop.Advice;
 * <p>Introductions are often <b>mixins</b>, enabling the building of composite
 * objects that can achieve many of the goals of multiple inheritance in Java.
 *
- * <p>Compared to {@link IntroductionInfo}, this interface allows an advice to
+ * <p>Compared to {qlink IntroductionInfo}, this interface allows an advice to
 * implement a range of interfaces that is not necessarily known in advance.
 * Thus an {@link IntroductionAdvisor} can be used to specify which interfaces
 * will be exposed in an advised object.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.core.SmartClassLoader;
 import org.springframework.lang.Nullable;

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

 		// No proxy needed.
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-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.
@@ -46,7 +46,6 @@ import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.SmartInstantiationAwareBeanPostProcessor;
-import org.springframework.core.SmartClassLoader;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -459,12 +458,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport
 			proxyFactory.setPreFiltered(true);
 		}

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

 	/**
@@ -509,10 +503,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport

 		List<Object> allInterceptors = new ArrayList<>();
 		if (specificInterceptors != null) {
-			if (specificInterceptors.length > 0) {
-				// specificInterceptors may equal PROXY_WITHOUT_ADDITIONAL_INTERCEPTORS
-				allInterceptors.addAll(Arrays.asList(specificInterceptors));
-			}
+			allInterceptors.addAll(Arrays.asList(specificInterceptors));
 			if (commonInterceptors.length > 0) {
 				if (this.applyCommonInterceptorsFirst) {
 					allInterceptors.addAll(0, Arrays.asList(commonInterceptors));
@@ -23,6 +23,8 @@ sourceSets {
 }

 compileGroovy {
+	sourceCompatibility = 1.8
+	targetCompatibility = 1.8
 	options.compilerArgs += "-Werror"
 }

@@ -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.
@@ -305,10 +305,8 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
 					Class<?> componentType = propValue.getClass().getComponentType();
 					Object newArray = Array.newInstance(componentType, arrayIndex + 1);
 					System.arraycopy(propValue, 0, newArray, 0, length);
-					int lastKeyIndex = tokens.canonicalName.lastIndexOf('[');
-					String propName = tokens.canonicalName.substring(0, lastKeyIndex);
-					setPropertyValue(propName, newArray);
-					propValue = getPropertyValue(propName);
+					setPropertyValue(tokens.actualName, newArray);
+					propValue = getPropertyValue(tokens.actualName);
 				}
 				Array.set(propValue, arrayIndex, convertedValue);
 			}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ import org.springframework.lang.Nullable;
 * (only applicable when running in a web application context)
 * <li>{@code postProcessBeforeInitialization} methods of BeanPostProcessors
 * <li>InitializingBean's {@code afterPropertiesSet}
- * <li>a custom {@code init-method} definition
+ * <li>a custom init-method definition
 * <li>{@code postProcessAfterInitialization} methods of BeanPostProcessors
 * </ol>
 *
@@ -92,7 +92,7 @@ import org.springframework.lang.Nullable;
 * <ol>
 * <li>{@code postProcessBeforeDestruction} methods of DestructionAwareBeanPostProcessors
 * <li>DisposableBean's {@code destroy}
- * <li>a custom {@code destroy-method} definition
+ * <li>a custom destroy-method definition
 * </ol>
 *
 * @author Rod Johnson
@@ -102,8 +102,6 @@ import org.springframework.lang.Nullable;
 * @see BeanNameAware#setBeanName
 * @see BeanClassLoaderAware#setBeanClassLoader
 * @see BeanFactoryAware#setBeanFactory
- * @see org.springframework.context.EnvironmentAware#setEnvironment
- * @see org.springframework.context.EmbeddedValueResolverAware#setEmbeddedValueResolver
 * @see org.springframework.context.ResourceLoaderAware#setResourceLoader
 * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher
 * @see org.springframework.context.MessageSourceAware#setMessageSource
@@ -113,7 +111,6 @@ import org.springframework.lang.Nullable;
 * @see InitializingBean#afterPropertiesSet
 * @see org.springframework.beans.factory.support.RootBeanDefinition#getInitMethodName
 * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization
- * @see org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor#postProcessBeforeDestruction
 * @see DisposableBean#destroy
 * @see org.springframework.beans.factory.support.RootBeanDefinition#getDestroyMethodName
 */
@@ -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.
@@ -36,16 +36,15 @@ import org.springframework.util.StringValueResolver;
 * Example XML bean definition:
 *
 * <pre class="code">
- * &lt;bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"&gt;
- *   &lt;property name="driverClassName" value="${driver}" /&gt;
- *   &lt;property name="url" value="jdbc:${dbname}" /&gt;
+ * &lt;bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"/&gt;
+ *   &lt;property name="driverClassName" value="${driver}"/&gt;
+ *   &lt;property name="url" value="jdbc:${dbname}"/&gt;
 * &lt;/bean&gt;
 * </pre>
 *
 * Example properties file:
 *
- * <pre class="code">
- * driver=com.mysql.jdbc.Driver
+ * <pre class="code">driver=com.mysql.jdbc.Driver
 * dbname=mysql:mydb</pre>
 *
 * Annotated bean definitions may take advantage of property replacement using
@@ -57,8 +56,7 @@ import org.springframework.util.StringValueResolver;
 * in bean references. Furthermore, placeholder values can also cross-reference
 * other placeholders, like:
 *
- * <pre class="code">
- * rootPath=myrootdir
+ * <pre class="code">rootPath=myrootdir
 * subPath=${rootPath}/subdir</pre>
 *
 * In contrast to {@link PropertyOverrideConfigurer}, subclasses of this type allow
@@ -73,13 +71,13 @@ import org.springframework.util.StringValueResolver;
 *
 * <p>Default property values can be defined globally for each configurer instance
 * via the {@link #setProperties properties} property, or on a property-by-property basis
- * using the value separator which is {@code ":"} by default and customizable via
- * {@link #setValueSeparator(String)}.
+ * using the default value separator which is {@code ":"} by default and
+ * customizable via {@link #setValueSeparator(String)}.
 *
 * <p>Example XML property with default value:
 *
 * <pre class="code">
- *   &lt;property name="url" value="jdbc:${dbname:defaultdb}" /&gt;
+ *   <property name="url" value="jdbc:${dbname:defaultdb}"/>
 * </pre>
 *
 * @author Chris Beams
@@ -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.
@@ -489,8 +489,8 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp
 						resolveConstructorArguments(args, 2, hasClosureArgument ? args.length - 1 : args.length);
 				this.currentBeanDefinition = new GroovyBeanDefinitionWrapper(beanName, (Class<?>) args[1], constructorArgs);
 				Map<?, ?> namedArgs = (Map<?, ?>) args[0];
-				for (Object key : namedArgs.keySet()) {
-					String propName = (String) key;
+				for (Object o : namedArgs.keySet()) {
+					String propName = (String) o;
 					setProperty(propName, namedArgs.get(propName));
 				}
 			}
@@ -894,7 +894,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess
 	}

 	/**
-	 * Return if there are property values defined for this bean.
+	 * Return if there are property values values defined for this bean.
 	 * @since 5.0.2
 	 */
 	@Override
@@ -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.
@@ -35,7 +35,6 @@ import org.springframework.cglib.proxy.Factory;
 import org.springframework.cglib.proxy.MethodInterceptor;
 import org.springframework.cglib.proxy.MethodProxy;
 import org.springframework.cglib.proxy.NoOp;
-import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -245,10 +244,8 @@ public class CglibSubclassingInstantiationStrategy extends SimpleInstantiationSt
 				return (bean.equals(null) ? null : bean);
 			}
 			else {
-				// Find target bean matching the (potentially generic) method return type
-				ResolvableType genericReturnType = ResolvableType.forMethodReturnType(method);
-				return (argsToUse != null ? this.owner.getBeanProvider(genericReturnType).getObject(argsToUse) :
-						this.owner.getBeanProvider(genericReturnType).getObject());
+				return (argsToUse != null ? this.owner.getBean(method.getReturnType(), argsToUse) :
+						this.owner.getBean(method.getReturnType()));
 			}
 		}
 	}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,25 +19,17 @@ package org.springframework.beans.factory.support;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

-import org.springframework.core.ResolvableType;
 import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;

 /**
- * Represents an override of a method that looks up an object in the same IoC context,
- * either by bean name or by bean type (based on the declared method return type).
+ * Represents an override of a method that looks up an object in the same IoC context.
 *
- * <p>Methods eligible for lookup override may declare arguments in which case the
- * given arguments are passed to the bean retrieval operation.
+ * <p>Methods eligible for lookup override must not have arguments.
 *
 * @author Rod Johnson
 * @author Juergen Hoeller
 * @since 1.1
- * @see org.springframework.beans.factory.BeanFactory#getBean(String)
- * @see org.springframework.beans.factory.BeanFactory#getBean(Class)
- * @see org.springframework.beans.factory.BeanFactory#getBean(String, Object...)
- * @see org.springframework.beans.factory.BeanFactory#getBean(Class, Object...)
- * @see org.springframework.beans.factory.BeanFactory#getBeanProvider(ResolvableType)
 */
 public class LookupOverride extends MethodOverride {

@@ -51,8 +43,8 @@ public class LookupOverride extends MethodOverride {
 	/**
 	 * Construct a new LookupOverride.
 	 * @param methodName the name of the method to override
-	 * @param beanName the name of the bean in the current {@code BeanFactory} that the
-	 * overridden method should return (may be {@code null} for type-based bean retrieval)
+	 * @param beanName the name of the bean in the current {@code BeanFactory}
+	 * that the overridden method should return (may be {@code null})
 	 */
 	public LookupOverride(String methodName, @Nullable String beanName) {
 		super(methodName);
@@ -61,9 +53,9 @@ public class LookupOverride extends MethodOverride {

 	/**
 	 * Construct a new LookupOverride.
-	 * @param method the method declaration to override
-	 * @param beanName the name of the bean in the current {@code BeanFactory} that the
-	 * overridden method should return (may be {@code null} for type-based bean retrieval)
+	 * @param method the method to override
+	 * @param beanName the name of the bean in the current {@code BeanFactory}
+	 * that the overridden method should return (may be {@code null})
 	 */
 	public LookupOverride(Method method, @Nullable String beanName) {
 		super(method.getName());
@@ -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.
@@ -19,8 +19,9 @@ package org.springframework.beans.factory.support;
 import java.lang.reflect.Method;

 /**
- * Interface to be implemented by classes that can reimplement any method on an
- * IoC-managed object: the <b>Method Injection</b> form of Dependency Injection.
+ * Interface to be implemented by classes that can reimplement any method
+ * on an IoC-managed object: the <b>Method Injection</b> form of
+ * Dependency Injection.
 *
 * <p>Such methods may be (but need not be) abstract, in which case the
 * container will create a concrete subclass to instantiate.
@@ -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.
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;

 /**
- * Extension of {@link MethodOverride} that represents an arbitrary
+ * Extension of MethodOverride that represents an arbitrary
 * override of a method by the IoC container.
 *
 * <p>Any non-final method can be overridden, irrespective of its
@@ -45,7 +45,7 @@ public class ReplaceOverride extends MethodOverride {
 	/**
 	 * Construct a new ReplaceOverride.
 	 * @param methodName the name of the method to override
-	 * @param methodReplacerBeanName the bean name of the {@link MethodReplacer}
+	 * @param methodReplacerBeanName the bean name of the MethodReplacer
 	 */
 	public ReplaceOverride(String methodName, String methodReplacerBeanName) {
 		super(methodName);
@@ -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.
@@ -23,9 +23,9 @@ import org.springframework.util.StringUtils;
 /**
 * Editor for {@code java.util.Locale}, to directly populate a Locale property.
 *
- * <p>Expects the same syntax as Locale's {@code toString()}, i.e. language +
+ * <p>Expects the same syntax as Locale's {@code toString}, i.e. language +
 * optionally country + optionally variant, separated by "_" (e.g. "en", "en_US").
- * Also accepts spaces as separators, as an alternative to underscores.
+ * Also accepts spaces as separators, as alternative to underscores.
 *
 * @author Juergen Hoeller
 * @since 26.05.2003
@@ -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.
@@ -26,8 +26,8 @@ import java.nio.file.Paths;

 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceEditor;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.Assert;
-import org.springframework.util.ResourceUtils;

 /**
 * Editor for {@code java.nio.file.Path}, to directly populate a Path
@@ -74,7 +74,7 @@ public class PathEditor extends PropertyEditorSupport {

 	@Override
 	public void setAsText(String text) throws IllegalArgumentException {
-		boolean nioPathCandidate = !text.startsWith(ResourceUtils.CLASSPATH_URL_PREFIX);
+		boolean nioPathCandidate = !text.startsWith(ResourceLoader.CLASSPATH_URL_PREFIX);
 		if (nioPathCandidate && !text.startsWith("/")) {
 			try {
 				URI uri = new URI(text);
@@ -85,13 +85,9 @@ public class PathEditor extends PropertyEditorSupport {
 					return;
 				}
 			}
-			catch (URISyntaxException ex) {
-				// Not a valid URI; potentially a Windows-style path after
-				// a file prefix (let's try as Spring resource location)
-				nioPathCandidate = !text.startsWith(ResourceUtils.FILE_URL_PREFIX);
-			}
-			catch (FileSystemNotFoundException ex) {
-				// URI scheme not registered for NIO (let's try URL
+			catch (URISyntaxException | FileSystemNotFoundException ex) {
+				// Not a valid URI (let's try as Spring resource location),
+				// or a URI scheme not registered for NIO (let's try URL
 				// protocol handlers via Spring's resource mechanism).
 			}
 		}
@@ -101,7 +97,7 @@ public class PathEditor extends PropertyEditorSupport {
 		if (resource == null) {
 			setValue(null);
 		}
-		else if (nioPathCandidate && !resource.exists()) {
+		else if (!resource.exists() && nioPathCandidate) {
 			setValue(Paths.get(text).normalize());
 		}
 		else {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -44,6 +44,8 @@ public class PropertyComparator<T> implements Comparator<T> {

 	private final SortDefinition sortDefinition;

+	private final BeanWrapperImpl beanWrapper = new BeanWrapperImpl(false);
+

 	/**
 	 * Create a new PropertyComparator for the given SortDefinition.
@@ -113,9 +115,8 @@ public class PropertyComparator<T> implements Comparator<T> {
 		// (similar to JSTL EL). If the property doesn't exist in the
 		// first place, let the exception through.
 		try {
-			BeanWrapperImpl beanWrapper = new BeanWrapperImpl(false);
-			beanWrapper.setWrappedInstance(obj);
-			return beanWrapper.getPropertyValue(this.sortDefinition.getProperty());
+			this.beanWrapper.setWrappedInstance(obj);
+			return this.beanWrapper.getPropertyValue(this.sortDefinition.getProperty());
 		}
 		catch (BeansException ex) {
 			logger.debug("PropertyComparator could not access property - treating as null for sorting", ex);
@@ -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.
@@ -28,7 +28,6 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 /**
 * @author Keith Donald
 * @author Juergen Hoeller
- * @author Sam Brannen
 */
 public class BeanWrapperAutoGrowingTests {

@@ -67,6 +66,11 @@ public class BeanWrapperAutoGrowingTests {
 		assertThat(bean.getArray()[0]).isInstanceOf(Bean.class);
 	}

+	private void assertNotNull(Object propertyValue) {
+		assertThat(propertyValue).isNotNull();
+	}
+
+
 	@Test
 	public void setPropertyValueAutoGrowArray() {
 		wrapper.setPropertyValue("array[0].prop", "test");
@@ -89,39 +93,12 @@ public class BeanWrapperAutoGrowingTests {
 	}

 	@Test
-	public void getPropertyValueAutoGrow2dArray() {
+	public void getPropertyValueAutoGrowMultiDimensionalArray() {
 		assertNotNull(wrapper.getPropertyValue("multiArray[0][0]"));
 		assertThat(bean.getMultiArray()[0].length).isEqualTo(1);
 		assertThat(bean.getMultiArray()[0][0]).isInstanceOf(Bean.class);
 	}

-	@Test
-	public void getPropertyValueAutoGrow3dArray() {
-		assertNotNull(wrapper.getPropertyValue("threeDimensionalArray[1][2][3]"));
-		assertThat(bean.getThreeDimensionalArray()[1].length).isEqualTo(3);
-		assertThat(bean.getThreeDimensionalArray()[1][2][3]).isInstanceOf(Bean.class);
-	}
-
-	@Test
-	public void setPropertyValueAutoGrow2dArray() {
-		Bean newBean = new Bean();
-		newBean.setProp("enigma");
-		wrapper.setPropertyValue("multiArray[2][3]", newBean);
-		assertThat(bean.getMultiArray()[2][3])
-			.isInstanceOf(Bean.class)
-			.extracting(Bean::getProp).isEqualTo("enigma");
-	}
-
-	@Test
-	public void setPropertyValueAutoGrow3dArray() {
-		Bean newBean = new Bean();
-		newBean.setProp("enigma");
-		wrapper.setPropertyValue("threeDimensionalArray[2][3][4]", newBean);
-		assertThat(bean.getThreeDimensionalArray()[2][3][4])
-			.isInstanceOf(Bean.class)
-			.extracting(Bean::getProp).isEqualTo("enigma");
-	}
-
 	@Test
 	public void getPropertyValueAutoGrowList() {
 		assertNotNull(wrapper.getPropertyValue("list[0]"));
@@ -154,7 +131,7 @@ public class BeanWrapperAutoGrowingTests {
 	public void getPropertyValueAutoGrowListFailsAgainstLimit() {
 		wrapper.setAutoGrowCollectionLimit(2);
 		assertThatExceptionOfType(InvalidPropertyException.class).isThrownBy(() ->
-				wrapper.getPropertyValue("list[4]"))
+				assertNotNull(wrapper.getPropertyValue("list[4]")))
 			.withRootCauseInstanceOf(IndexOutOfBoundsException.class);
 	}

@@ -184,11 +161,6 @@ public class BeanWrapperAutoGrowingTests {
 	}


-	private static void assertNotNull(Object propertyValue) {
-		assertThat(propertyValue).isNotNull();
-	}
-
-
 	@SuppressWarnings("rawtypes")
 	public static class Bean {

@@ -202,8 +174,6 @@ public class BeanWrapperAutoGrowingTests {

 		private Bean[][] multiArray;

-		private Bean[][][] threeDimensionalArray;
-
 		private List<Bean> list;

 		private List<List<Bean>> multiList;
@@ -244,14 +214,6 @@ public class BeanWrapperAutoGrowingTests {
 			this.multiArray = multiArray;
 		}

-		public Bean[][][] getThreeDimensionalArray() {
-			return threeDimensionalArray;
-		}
-
-		public void setThreeDimensionalArray(Bean[][][] threeDimensionalArray) {
-			this.threeDimensionalArray = threeDimensionalArray;
-		}
-
 		public List<Bean> getList() {
 			return list;
 		}
@@ -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.
@@ -18,14 +18,14 @@ package org.springframework.beans;

 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;

 import static org.assertj.core.api.Assertions.assertThat;
@@ -36,21 +36,23 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Chris Beams
 * @since 08.03.2004
 */
-class ConcurrentBeanWrapperTests {
+public class ConcurrentBeanWrapperTests {

 	private final Log logger = LogFactory.getLog(getClass());

-	private final Set<TestRun> set = ConcurrentHashMap.newKeySet();
+	private Set<TestRun> set = Collections.synchronizedSet(new HashSet<TestRun>());

 	private Throwable ex = null;

-	@RepeatedTest(100)
-	void testSingleThread() {
-		performSet();
+	@Test
+	public void testSingleThread() {
+		for (int i = 0; i < 100; i++) {
+			performSet();
+		}
 	}

 	@Test
-	void testConcurrent() {
+	public void testConcurrent() {
 		for (int i = 0; i < 10; i++) {
 			TestRun run = new TestRun(this);
 			set.add(run);
@@ -80,7 +82,7 @@ class ConcurrentBeanWrapperTests {

 		Properties p = (Properties) System.getProperties().clone();

-		assertThat(p).as("The System properties must not be empty").isNotEmpty();
+		assertThat(p.size() != 0).as("The System properties must not be empty").isTrue();

 		for (Iterator<?> i = p.entrySet().iterator(); i.hasNext();) {
 			i.next();
@@ -109,7 +111,7 @@ class ConcurrentBeanWrapperTests {

 		private ConcurrentBeanWrapperTests test;

-		TestRun(ConcurrentBeanWrapperTests test) {
+		public TestRun(ConcurrentBeanWrapperTests test) {
 			this.test = test;
 		}

@@ -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.
@@ -121,18 +121,6 @@ public class LookupAnnotationTests {
 		assertThat(beanFactory.getBean(BeanConsumer.class).abstractBean).isSameAs(bean);
 	}

-	@Test
-	public void testWithGenericBean() {
-		beanFactory.registerBeanDefinition("numberBean", new RootBeanDefinition(NumberBean.class));
-		beanFactory.registerBeanDefinition("doubleStore", new RootBeanDefinition(DoubleStore.class));
-		beanFactory.registerBeanDefinition("floatStore", new RootBeanDefinition(FloatStore.class));
-
-		NumberBean bean = (NumberBean) beanFactory.getBean("numberBean");
-		assertThat(bean).isNotNull();
-		assertThat(beanFactory.getBean(DoubleStore.class)).isSameAs(bean.getDoubleStore());
-		assertThat(beanFactory.getBean(FloatStore.class)).isSameAs(bean.getFloatStore());
-	}
-

 	public static abstract class AbstractBean {

@@ -159,26 +147,4 @@ public class LookupAnnotationTests {
 		AbstractBean abstractBean;
 	}

-
-	public static class NumberStore<T extends Number> {
-	}
-
-
-	public static class DoubleStore extends NumberStore<Double> {
-	}
-
-
-	public static class FloatStore extends NumberStore<Float> {
-	}
-
-
-	public static abstract class NumberBean {
-
-		@Lookup
-		public abstract NumberStore<Double> getDoubleStore();
-
-		@Lookup
-		public abstract NumberStore<Float> getFloatStore();
-	}
-
 }
@@ -141,7 +141,6 @@ class YamlProcessorTests {
 	}

 	@Test
-	@SuppressWarnings("unchecked")
 	void standardTypesSupportedByDefault() throws Exception {
 		setYaml("value: !!set\n  ? first\n  ? second");
 		this.processor.process((properties, map) -> {
@@ -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.
@@ -36,7 +36,7 @@ public class LookupMethodTests {


 	@BeforeEach
-	public void setup() {
+	public void setUp() {
 		beanFactory = new DefaultListableBeanFactory();
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory);
 		reader.loadBeanDefinitions(new ClassPathResource("lookupMethodTests.xml", getClass()));
@@ -83,8 +83,8 @@ public class LookupMethodTests {
 	public void testWithThreeArgsShouldFail() {
 		AbstractBean bean = (AbstractBean) beanFactory.getBean("abstractBean");
 		assertThat(bean).isNotNull();
-		assertThatExceptionOfType(AbstractMethodError.class).as("does not have a three arg constructor")
-				.isThrownBy(() -> bean.getThreeArguments("name", 1, 2));
+		assertThatExceptionOfType(AbstractMethodError.class).as("does not have a three arg constructor").isThrownBy(() ->
+			bean.getThreeArguments("name", 1, 2));
 	}

 	@Test
@@ -97,21 +97,6 @@ public class LookupMethodTests {
 		assertThat(expected.isJedi()).isTrue();
 	}

-	@Test
-	public void testWithGenericBean() {
-		RootBeanDefinition bd = new RootBeanDefinition(NumberBean.class);
-		bd.getMethodOverrides().addOverride(new LookupOverride("getDoubleStore", null));
-		bd.getMethodOverrides().addOverride(new LookupOverride("getFloatStore", null));
-		beanFactory.registerBeanDefinition("numberBean", bd);
-		beanFactory.registerBeanDefinition("doubleStore", new RootBeanDefinition(DoubleStore.class));
-		beanFactory.registerBeanDefinition("floatStore", new RootBeanDefinition(FloatStore.class));
-
-		NumberBean bean = (NumberBean) beanFactory.getBean("numberBean");
-		assertThat(bean).isNotNull();
-		assertThat(beanFactory.getBean(DoubleStore.class)).isSameAs(bean.getDoubleStore());
-		assertThat(beanFactory.getBean(FloatStore.class)).isSameAs(bean.getFloatStore());
-	}
-

 	public static abstract class AbstractBean {

@@ -126,24 +111,4 @@ public class LookupMethodTests {
 		public abstract TestBean getThreeArguments(String name, int age, int anotherArg);
 	}

-
-	public static class NumberStore<T extends Number> {
-	}
-
-
-	public static class DoubleStore extends NumberStore<Double> {
-	}
-
-
-	public static class FloatStore extends NumberStore<Float> {
-	}
-
-
-	public static abstract class NumberBean {
-
-		public abstract NumberStore<Double> getDoubleStore();
-
-		public abstract NumberStore<Float> getFloatStore();
-	}
-
 }
@@ -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.
@@ -34,78 +34,57 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
 public class PathEditorTests {

 	@Test
-	public void testClasspathPathName() {
+	public void testClasspathPathName() throws Exception {
 		PropertyEditor pathEditor = new PathEditor();
 		pathEditor.setAsText("classpath:" + ClassUtils.classPackageAsResourcePath(getClass()) + "/" +
 				ClassUtils.getShortName(getClass()) + ".class");
 		Object value = pathEditor.getValue();
-		assertThat(value instanceof Path).isTrue();
+		boolean condition = value instanceof Path;
+		assertThat(condition).isTrue();
 		Path path = (Path) value;
 		assertThat(path.toFile().exists()).isTrue();
 	}

 	@Test
-	public void testWithNonExistentResource() {
+	public void testWithNonExistentResource() throws Exception {
 		PropertyEditor propertyEditor = new PathEditor();
 		assertThatIllegalArgumentException().isThrownBy(() ->
 				propertyEditor.setAsText("classpath:/no_way_this_file_is_found.doc"));
 	}

 	@Test
-	public void testWithNonExistentPath() {
+	public void testWithNonExistentPath() throws Exception {
 		PropertyEditor pathEditor = new PathEditor();
 		pathEditor.setAsText("file:/no_way_this_file_is_found.doc");
 		Object value = pathEditor.getValue();
-		assertThat(value instanceof Path).isTrue();
+		boolean condition1 = value instanceof Path;
+		assertThat(condition1).isTrue();
 		Path path = (Path) value;
-		assertThat(!path.toFile().exists()).isTrue();
+		boolean condition = !path.toFile().exists();
+		assertThat(condition).isTrue();
 	}

 	@Test
-	public void testAbsolutePath() {
+	public void testAbsolutePath() throws Exception {
 		PropertyEditor pathEditor = new PathEditor();
 		pathEditor.setAsText("/no_way_this_file_is_found.doc");
 		Object value = pathEditor.getValue();
-		assertThat(value instanceof Path).isTrue();
+		boolean condition1 = value instanceof Path;
+		assertThat(condition1).isTrue();
 		Path path = (Path) value;
-		assertThat(!path.toFile().exists()).isTrue();
+		boolean condition = !path.toFile().exists();
+		assertThat(condition).isTrue();
 	}

 	@Test
-	public void testWindowsAbsolutePath() {
-		PropertyEditor pathEditor = new PathEditor();
-		pathEditor.setAsText("C:\\no_way_this_file_is_found.doc");
-		Object value = pathEditor.getValue();
-		assertThat(value instanceof Path).isTrue();
-		Path path = (Path) value;
-		assertThat(!path.toFile().exists()).isTrue();
-	}
-
-	@Test
-	public void testWindowsAbsoluteFilePath() {
-		PropertyEditor pathEditor = new PathEditor();
-		try {
-			pathEditor.setAsText("file://C:\\no_way_this_file_is_found.doc");
-			Object value = pathEditor.getValue();
-			assertThat(value instanceof Path).isTrue();
-			Path path = (Path) value;
-			assertThat(!path.toFile().exists()).isTrue();
-		}
-		catch (IllegalArgumentException ex) {
-			if (File.separatorChar == '\\') {  // on Windows, otherwise silently ignore
-				throw ex;
-			}
-		}
-	}
-
-	@Test
-	public void testUnqualifiedPathNameFound() {
+	public void testUnqualifiedPathNameFound() throws Exception {
 		PropertyEditor pathEditor = new PathEditor();
 		String fileName = ClassUtils.classPackageAsResourcePath(getClass()) + "/" +
 				ClassUtils.getShortName(getClass()) + ".class";
 		pathEditor.setAsText(fileName);
 		Object value = pathEditor.getValue();
-		assertThat(value instanceof Path).isTrue();
+		boolean condition = value instanceof Path;
+		assertThat(condition).isTrue();
 		Path path = (Path) value;
 		File file = path.toFile();
 		assertThat(file.exists()).isTrue();
@@ -117,13 +96,14 @@ public class PathEditorTests {
 	}

 	@Test
-	public void testUnqualifiedPathNameNotFound() {
+	public void testUnqualifiedPathNameNotFound() throws Exception {
 		PropertyEditor pathEditor = new PathEditor();
 		String fileName = ClassUtils.classPackageAsResourcePath(getClass()) + "/" +
 				ClassUtils.getShortName(getClass()) + ".clazz";
 		pathEditor.setAsText(fileName);
 		Object value = pathEditor.getValue();
-		assertThat(value instanceof Path).isTrue();
+		boolean condition = value instanceof Path;
+		assertThat(condition).isTrue();
 		Path path = (Path) value;
 		File file = path.toFile();
 		assertThat(file.exists()).isFalse();
@@ -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.
@@ -19,6 +19,7 @@ package org.springframework.context.index.processor;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -36,7 +37,7 @@ import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;

 /**
- * Annotation {@link Processor} that writes a {@link CandidateComponentsMetadata}
+ * Annotation {@link Processor} that writes {@link CandidateComponentsMetadata}
 * file for spring components.
 *
 * @author Stephane Nicoll
@@ -45,6 +46,9 @@ import javax.lang.model.element.TypeElement;
 */
 public class CandidateComponentsIndexer implements Processor {

+	private static final Set<ElementKind> TYPE_KINDS =
+			Collections.unmodifiableSet(EnumSet.of(ElementKind.CLASS, ElementKind.INTERFACE));
+
 	private MetadataStore metadataStore;

 	private MetadataCollector metadataCollector;
@@ -132,8 +136,7 @@ public class CandidateComponentsIndexer implements Processor {
 	private static List<TypeElement> staticTypesIn(Iterable<? extends Element> elements) {
 		List<TypeElement> list = new ArrayList<>();
 		for (Element element : elements) {
-			if ((element.getKind().isClass() || element.getKind() == ElementKind.INTERFACE) &&
-					element.getModifiers().contains(Modifier.STATIC) && element instanceof TypeElement) {
+			if (TYPE_KINDS.contains(element.getKind()) && element.getModifiers().contains(Modifier.STATIC)) {
 				list.add((TypeElement) 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.
@@ -26,7 +26,7 @@ import javax.lang.model.element.ElementKind;

 /**
 * A {@link StereotypesProvider} implementation that extracts the stereotypes
- * flagged by the {@value #INDEXED_ANNOTATION} annotation. This implementation
+ * flagged by the {@value INDEXED_ANNOTATION} annotation. This implementation
 * honors stereotypes defined this way on meta-annotations.
 *
 * @author Stephane Nicoll
@@ -48,7 +48,7 @@ class IndexedStereotypesProvider implements StereotypesProvider {
 	public Set<String> getStereotypes(Element element) {
 		Set<String> stereotypes = new LinkedHashSet<>();
 		ElementKind kind = element.getKind();
-		if (!kind.isClass() && kind != ElementKind.INTERFACE) {
+		if (kind != ElementKind.CLASS && kind != ElementKind.INTERFACE) {
 			return stereotypes;
 		}
 		Set<Element> seen = new HashSet<>();
@@ -24,7 +24,7 @@ import javax.lang.model.element.ElementKind;

 /**
 * A {@link StereotypesProvider} implementation that provides the
- * {@value #STEREOTYPE} stereotype for each package-info.
+ * {@value STEREOTYPE} stereotype for each package-info.
 *
 * @author Stephane Nicoll
 * @since 5.0
@@ -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.
@@ -24,8 +24,8 @@ import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;

 /**
- * A {@link StereotypesProvider} that extracts a stereotype for each
- * {@code javax.*} annotation <i>present</i> on a class or interface.
+ * A {@link StereotypesProvider} that extract a stereotype for each
+ * {@code javax.*} annotation placed on a class or interface.
 *
 * @author Stephane Nicoll
 * @since 5.0
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import javax.lang.model.element.Element;

 /**
 * Provide the list of stereotypes that match an {@link Element}.
- * <p>If an element has one or more stereotypes, it is referenced in the index
+ * If an element has one more stereotypes, it is referenced in the index
 * of candidate components and each stereotype can be queried individually.
 *
 * @author Stephane Nicoll
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -130,8 +130,8 @@ public class EhCacheManagerFactoryBean implements FactoryBean<CacheManager>, Ini

 	@Override
 	public void afterPropertiesSet() throws CacheException {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Initializing EhCache CacheManager" +
+		if (logger.isInfoEnabled()) {
+			logger.info("Initializing EhCache CacheManager" +
 					(this.cacheManagerName != null ? " '" + this.cacheManagerName + "'" : ""));
 		}

@@ -188,8 +188,8 @@ public class EhCacheManagerFactoryBean implements FactoryBean<CacheManager>, Ini
 	@Override
 	public void destroy() {
 		if (this.cacheManager != null && this.locallyManaged) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Shutting down EhCache CacheManager" +
+			if (logger.isInfoEnabled()) {
+				logger.info("Shutting down EhCache CacheManager" +
 						(this.cacheManagerName != null ? " '" + this.cacheManagerName + "'" : ""));
 			}
 			this.cacheManager.shutdown();
@@ -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.
@@ -221,11 +221,11 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 			}
 			catch (NoUniqueBeanDefinitionException ex) {
 				throw new IllegalStateException("No CacheResolver specified, and no unique bean of type " +
-						"CacheManager found. Mark one as primary or declare a specific CacheManager to use.", ex);
+						"CacheManager found. Mark one as primary or declare a specific CacheManager to use.");
 			}
 			catch (NoSuchBeanDefinitionException ex) {
 				throw new IllegalStateException("No CacheResolver specified, and no bean of type CacheManager found. " +
-						"Register a CacheManager bean or remove the @EnableCaching annotation from your configuration.", ex);
+						"Register a CacheManager bean or remove the @EnableCaching annotation from your configuration.");
 			}
 		}
 		this.initialized = true;
@@ -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.
@@ -16,7 +16,6 @@

 package org.springframework.context;

-import java.time.Clock;
 import java.util.EventObject;

 /**
@@ -38,37 +37,18 @@ public abstract class ApplicationEvent extends EventObject {


 	/**
-	 * Create a new {@code ApplicationEvent} with its {@link #getTimestamp() timestamp}
-	 * set to {@link System#currentTimeMillis()}.
+	 * Create a new {@code ApplicationEvent}.
 	 * @param source the object on which the event initially occurred or with
 	 * which the event is associated (never {@code null})
-	 * @see #ApplicationEvent(Object, Clock)
 	 */
 	public ApplicationEvent(Object source) {
 		super(source);
 		this.timestamp = System.currentTimeMillis();
 	}

-	/**
-	 * Create a new {@code ApplicationEvent} with its {@link #getTimestamp() timestamp}
-	 * set to the value returned by {@link Clock#millis()} in the provided {@link Clock}.
-	 * <p>This constructor is typically used in testing scenarios.
-	 * @param source the object on which the event initially occurred or with
-	 * which the event is associated (never {@code null})
-	 * @param clock a clock which will provide the timestamp
-	 * @since 5.3.8
-	 * @see #ApplicationEvent(Object)
-	 */
-	public ApplicationEvent(Object source, Clock clock) {
-		super(source);
-		this.timestamp = clock.millis();
-	}
-

 	/**
-	 * Return the time in milliseconds when the event occurred.
-	 * @see #ApplicationEvent(Object)
-	 * @see #ApplicationEvent(Object, Clock)
+	 * Return the system time in milliseconds when the event occurred.
 	 */
 	public final long getTimestamp() {
 		return this.timestamp;
@@ -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.
@@ -35,8 +35,6 @@ import java.util.function.Consumer;
 * @param <E> the specific {@code ApplicationEvent} subclass to listen to
 * @see org.springframework.context.ApplicationEvent
 * @see org.springframework.context.event.ApplicationEventMulticaster
- * @see org.springframework.context.event.SmartApplicationListener
- * @see org.springframework.context.event.GenericApplicationListener
 * @see org.springframework.context.event.EventListener
 */
@FunctionalInterface
@@ -75,17 +75,16 @@ import org.springframework.util.ClassUtils;
 *
 * <p>Registered by default when using {@code <context:annotation-config/>} or
 * {@code <context:component-scan/>}. Otherwise, may be declared manually as
- * with any other {@link BeanFactoryPostProcessor}.
+ * with any other BeanFactoryPostProcessor.
 *
 * <p>This post processor is priority-ordered as it is important that any
- * {@link Bean @Bean} methods declared in {@code @Configuration} classes have
+ * {@link Bean} methods declared in {@code @Configuration} classes have
 * their corresponding bean definitions registered before any other
- * {@code BeanFactoryPostProcessor} executes.
+ * {@link BeanFactoryPostProcessor} executes.
 *
 * @author Chris Beams
 * @author Juergen Hoeller
 * @author Phillip Webb
- * @author Sam Brannen
 * @since 3.0
 */
 public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPostProcessor,
@@ -390,30 +389,21 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 		for (String beanName : beanFactory.getBeanDefinitionNames()) {
 			BeanDefinition beanDef = beanFactory.getBeanDefinition(beanName);
 			Object configClassAttr = beanDef.getAttribute(ConfigurationClassUtils.CONFIGURATION_CLASS_ATTRIBUTE);
-			AnnotationMetadata annotationMetadata = null;
 			MethodMetadata methodMetadata = null;
 			if (beanDef instanceof AnnotatedBeanDefinition) {
-				AnnotatedBeanDefinition annotatedBeanDefinition = (AnnotatedBeanDefinition) beanDef;
-				annotationMetadata = annotatedBeanDefinition.getMetadata();
-				methodMetadata = annotatedBeanDefinition.getFactoryMethodMetadata();
+				methodMetadata = ((AnnotatedBeanDefinition) beanDef).getFactoryMethodMetadata();
 			}
 			if ((configClassAttr != null || methodMetadata != null) && beanDef instanceof AbstractBeanDefinition) {
 				// Configuration class (full or lite) or a configuration-derived @Bean method
-				// -> eagerly resolve bean class at this point, unless it's a 'lite' configuration
-				// or component class without @Bean methods.
+				// -> resolve bean class at this point...
 				AbstractBeanDefinition abd = (AbstractBeanDefinition) beanDef;
 				if (!abd.hasBeanClass()) {
-					boolean liteConfigurationCandidateWithoutBeanMethods =
-							(ConfigurationClassUtils.CONFIGURATION_CLASS_LITE.equals(configClassAttr) &&
-								annotationMetadata != null && !ConfigurationClassUtils.hasBeanMethods(annotationMetadata));
-					if (!liteConfigurationCandidateWithoutBeanMethods) {
-						try {
-							abd.resolveBeanClass(this.beanClassLoader);
-						}
-						catch (Throwable ex) {
-							throw new IllegalStateException(
-									"Cannot load configuration class: " + beanDef.getBeanClassName(), ex);
-						}
+					try {
+						abd.resolveBeanClass(this.beanClassLoader);
+					}
+					catch (Throwable ex) {
+						throw new IllegalStateException(
+								"Cannot load configuration class: " + beanDef.getBeanClassName(), ex);
 					}
 				}
 			}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@ import org.springframework.stereotype.Component;
 *
 * @author Chris Beams
 * @author Juergen Hoeller
- * @author Sam Brannen
 * @since 3.1
 */
 abstract class ConfigurationClassUtils {
@@ -163,10 +162,6 @@ abstract class ConfigurationClassUtils {
 		}

 		// Finally, let's look for @Bean methods...
-		return hasBeanMethods(metadata);
-	}
-
-	static boolean hasBeanMethods(AnnotationMetadata metadata) {
 		try {
 			return metadata.hasAnnotatedMethods(Bean.class.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.
@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;

 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.beans.factory.BeanClassLoaderAware;
@@ -138,22 +137,6 @@ public abstract class AbstractApplicationEventMulticaster
 		}
 	}

-	@Override
-	public void removeApplicationListeners(Predicate<ApplicationListener<?>> predicate) {
-		synchronized (this.defaultRetriever) {
-			this.defaultRetriever.applicationListeners.removeIf(predicate);
-			this.retrieverCache.clear();
-		}
-	}
-
-	@Override
-	public void removeApplicationListenerBeans(Predicate<String> predicate) {
-		synchronized (this.defaultRetriever) {
-			this.defaultRetriever.applicationListenerBeans.removeIf(predicate);
-			this.retrieverCache.clear();
-		}
-	}
-
 	@Override
 	public void removeAllListeners() {
 		synchronized (this.defaultRetriever) {
@@ -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.
@@ -16,8 +16,6 @@

 package org.springframework.context.event;

-import java.util.function.Predicate;
-
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.ResolvableType;
@@ -41,68 +39,31 @@ public interface ApplicationEventMulticaster {
 	/**
 	 * Add a listener to be notified of all events.
 	 * @param listener the listener to add
-	 * @see #removeApplicationListener(ApplicationListener)
-	 * @see #removeApplicationListeners(Predicate)
 	 */
 	void addApplicationListener(ApplicationListener<?> listener);

 	/**
 	 * Add a listener bean to be notified of all events.
 	 * @param listenerBeanName the name of the listener bean to add
-	 * @see #removeApplicationListenerBean(String)
-	 * @see #removeApplicationListenerBeans(Predicate)
 	 */
 	void addApplicationListenerBean(String listenerBeanName);

 	/**
 	 * Remove a listener from the notification list.
 	 * @param listener the listener to remove
-	 * @see #addApplicationListener(ApplicationListener)
-	 * @see #removeApplicationListeners(Predicate)
 	 */
 	void removeApplicationListener(ApplicationListener<?> listener);

 	/**
 	 * Remove a listener bean from the notification list.
 	 * @param listenerBeanName the name of the listener bean to remove
-	 * @see #addApplicationListenerBean(String)
-	 * @see #removeApplicationListenerBeans(Predicate)
 	 */
 	void removeApplicationListenerBean(String listenerBeanName);

-	/**
-	 * Remove all matching listeners from the set of registered
-	 * {@code ApplicationListener} instances (which includes adapter classes
-	 * such as {@link ApplicationListenerMethodAdapter}, e.g. for annotated
-	 * {@link EventListener} methods).
-	 * <p>Note: This just applies to instance registrations, not to listeners
-	 * registered by bean name.
-	 * @param predicate the predicate to identify listener instances to remove,
-	 * e.g. checking {@link SmartApplicationListener#getListenerId()}
-	 * @since 5.3.5
-	 * @see #addApplicationListener(ApplicationListener)
-	 * @see #removeApplicationListener(ApplicationListener)
-	 */
-	void removeApplicationListeners(Predicate<ApplicationListener<?>> predicate);
-
-	/**
-	 * Remove all matching listener beans from the set of registered
-	 * listener bean names (referring to bean classes which in turn
-	 * implement the {@link ApplicationListener} interface directly).
-	 * <p>Note: This just applies to bean name registrations, not to
-	 * programmatically registered {@code ApplicationListener} instances.
-	 * @param predicate the predicate to identify listener bean names to remove
-	 * @since 5.3.5
-	 * @see #addApplicationListenerBean(String)
-	 * @see #removeApplicationListenerBean(String)
-	 */
-	void removeApplicationListenerBeans(Predicate<String> predicate);
-
 	/**
 	 * Remove all listeners registered with this multicaster.
 	 * <p>After a remove call, the multicaster will perform no action
 	 * on event notification until new listeners are registered.
-	 * @see #removeApplicationListeners(Predicate)
 	 */
 	void removeAllListeners();

@@ -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 java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.StringJoiner;
 import java.util.concurrent.CompletionStage;

 import org.apache.commons.logging.Log;
@@ -90,9 +89,6 @@ public class ApplicationListenerMethodAdapter implements GenericApplicationListe

 	private final int order;

-	@Nullable
-	private volatile String listenerId;
-
 	@Nullable
 	private ApplicationContext applicationContext;

@@ -117,8 +113,6 @@ public class ApplicationListenerMethodAdapter implements GenericApplicationListe
 		this.declaredEventTypes = resolveDeclaredEventTypes(method, ann);
 		this.condition = (ann != null ? ann.condition() : null);
 		this.order = resolveOrder(this.targetMethod);
-		String id = (ann != null ? ann.id() : "");
-		this.listenerId = (!id.isEmpty() ? id : null);
 	}

 	private static List<ResolvableType> resolveDeclaredEventTypes(Method method, @Nullable EventListener ann) {
@@ -192,32 +186,6 @@ public class ApplicationListenerMethodAdapter implements GenericApplicationListe
 		return this.order;
 	}

-	@Override
-	public String getListenerId() {
-		String id = this.listenerId;
-		if (id == null) {
-			id = getDefaultListenerId();
-			this.listenerId = id;
-		}
-		return id;
-	}
-
-	/**
-	 * Determine the default id for the target listener, to be applied in case of
-	 * no {@link EventListener#id() annotation-specified id value}.
-	 * <p>The default implementation builds a method name with parameter types.
-	 * @since 5.3.5
-	 * @see #getListenerId()
-	 */
-	protected String getDefaultListenerId() {
-		Method method = getTargetMethod();
-		StringJoiner sj = new StringJoiner(",", "(", ")");
-		for (Class<?> paramType : method.getParameterTypes()) {
-			sj.add(paramType.getName());
-		}
-		return ClassUtils.getQualifiedMethodName(method) + sj.toString();
-	}
-

 	/**
 	 * Process the specified {@link ApplicationEvent}, checking if the condition
@@ -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.
@@ -21,7 +21,6 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.function.Predicate;

 import org.springframework.context.ApplicationEvent;
 import org.springframework.core.annotation.AliasFor;
@@ -84,7 +83,6 @@ import org.springframework.core.annotation.AliasFor;
 * @author Sam Brannen
 * @since 4.2
 * @see EventListenerMethodProcessor
- * @see org.springframework.transaction.event.TransactionalEventListener
 */
@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
@Retention(RetentionPolicy.RUNTIME)
@@ -130,13 +128,4 @@ public @interface EventListener {
 	 */
 	String condition() default "";

-	/**
-	 * An optional identifier for the listener, defaulting to the fully-qualified
-	 * signature of the declaring method (e.g. "mypackage.MyClass.myMethod()").
-	 * @since 5.3.5
-	 * @see SmartApplicationListener#getListenerId()
-	 * @see ApplicationEventMulticaster#removeApplicationListeners(Predicate)
-	 */
-	String id() default "";
-
 }
@@ -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.
@@ -18,7 +18,9 @@ package org.springframework.context.event;

 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
+import org.springframework.core.Ordered;
 import org.springframework.core.ResolvableType;
+import org.springframework.lang.Nullable;

 /**
 * Extended variant of the standard {@link ApplicationListener} interface,
@@ -26,26 +28,13 @@ import org.springframework.core.ResolvableType;
 *
 * <p>As of Spring Framework 4.2, this interface supersedes the Class-based
 * {@link SmartApplicationListener} with full handling of generic event types.
- * As of 5.3.5, it formally extends {@link SmartApplicationListener}, adapting
- * {@link #supportsEventType(Class)} to {@link #supportsEventType(ResolvableType)}
- * with a default method.
 *
 * @author Stephane Nicoll
- * @author Juergen Hoeller
 * @since 4.2
 * @see SmartApplicationListener
 * @see GenericApplicationListenerAdapter
 */
-public interface GenericApplicationListener extends SmartApplicationListener {
-
-	/**
-	 * Overrides {@link SmartApplicationListener#supportsEventType(Class)} with
-	 * delegation to {@link #supportsEventType(ResolvableType)}.
-	 */
-	@Override
-	default boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
-		return supportsEventType(ResolvableType.forClass(eventType));
-	}
+public interface GenericApplicationListener extends ApplicationListener<ApplicationEvent>, Ordered {

 	/**
 	 * Determine whether this listener actually supports the given event type.
@@ -53,4 +42,22 @@ public interface GenericApplicationListener extends SmartApplicationListener {
 	 */
 	boolean supportsEventType(ResolvableType eventType);

+	/**
+	 * Determine whether this listener actually supports the given source type.
+	 * <p>The default implementation always returns {@code true}.
+	 * @param sourceType the source type, or {@code null} if no source
+	 */
+	default boolean supportsSourceType(@Nullable Class<?> sourceType) {
+		return true;
+	}
+
+	/**
+	 * Determine this listener's order in a set of listeners for the same event.
+	 * <p>The default implementation returns {@link #LOWEST_PRECEDENCE}.
+	 */
+	@Override
+	default int getOrder() {
+		return LOWEST_PRECEDENCE;
+	}
+
 }
@@ -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.
@@ -36,7 +36,7 @@ import org.springframework.util.ConcurrentReferenceHashMap;
 * @since 3.0
 * @see org.springframework.context.ApplicationListener#onApplicationEvent
 */
-public class GenericApplicationListenerAdapter implements GenericApplicationListener {
+public class GenericApplicationListenerAdapter implements GenericApplicationListener, SmartApplicationListener {

 	private static final Map<Class<?>, ResolvableType> eventTypeCache = new ConcurrentReferenceHashMap<>();

@@ -67,10 +67,7 @@ public class GenericApplicationListenerAdapter implements GenericApplicationList
 	@Override
 	@SuppressWarnings("unchecked")
 	public boolean supportsEventType(ResolvableType eventType) {
-		if (this.delegate instanceof GenericApplicationListener) {
-			return ((GenericApplicationListener) this.delegate).supportsEventType(eventType);
-		}
-		else if (this.delegate instanceof SmartApplicationListener) {
+		if (this.delegate instanceof SmartApplicationListener) {
 			Class<? extends ApplicationEvent> eventClass = (Class<? extends ApplicationEvent>) eventType.resolve();
 			return (eventClass != null && ((SmartApplicationListener) this.delegate).supportsEventType(eventClass));
 		}
@@ -79,6 +76,11 @@ public class GenericApplicationListenerAdapter implements GenericApplicationList
 		}
 	}

+	@Override
+	public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
+		return supportsEventType(ResolvableType.forClass(eventType));
+	}
+
 	@Override
 	public boolean supportsSourceType(@Nullable Class<?> sourceType) {
 		return !(this.delegate instanceof SmartApplicationListener) ||
@@ -90,12 +92,6 @@ public class GenericApplicationListenerAdapter implements GenericApplicationList
 		return (this.delegate instanceof Ordered ? ((Ordered) this.delegate).getOrder() : Ordered.LOWEST_PRECEDENCE);
 	}

-	@Override
-	public String getListenerId() {
-		return (this.delegate instanceof SmartApplicationListener ?
-				((SmartApplicationListener) this.delegate).getListenerId() : "");
-	}
-

 	@Nullable
 	private static ResolvableType resolveDeclaredEventType(ApplicationListener<ApplicationEvent> listener) {
@@ -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.
@@ -59,15 +59,4 @@ public interface SmartApplicationListener extends ApplicationListener<Applicatio
 		return LOWEST_PRECEDENCE;
 	}

-	/**
-	 * Return an optional identifier for the listener.
-	 * <p>The default value is an empty String.
-	 * @since 5.3.5
-	 * @see EventListener#id
-	 * @see ApplicationEventMulticaster#removeApplicationListeners
-	 */
-	default String getListenerId() {
-		return "";
-	}
-
 }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import org.springframework.lang.Nullable;
 * @author Stephane Nicoll
 * @since 2.0.5
 */
-public class SourceFilteringListener implements GenericApplicationListener {
+public class SourceFilteringListener implements GenericApplicationListener, SmartApplicationListener {

 	private final Object source;

@@ -79,6 +79,11 @@ public class SourceFilteringListener implements GenericApplicationListener {
 		return (this.delegate == null || this.delegate.supportsEventType(eventType));
 	}

+	@Override
+	public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
+		return supportsEventType(ResolvableType.forType(eventType));
+	}
+
 	@Override
 	public boolean supportsSourceType(@Nullable Class<?> sourceType) {
 		return (sourceType != null && sourceType.isInstance(this.source));
@@ -89,11 +94,6 @@ public class SourceFilteringListener implements GenericApplicationListener {
 		return (this.delegate != null ? this.delegate.getOrder() : Ordered.LOWEST_PRECEDENCE);
 	}

-	@Override
-	public String getListenerId() {
-		return (this.delegate != null ? this.delegate.getListenerId() : "");
-	}
-

 	/**
 	 * Actually process the event, after having filtered according to the
@@ -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.
@@ -48,13 +48,13 @@ public final class CandidateComponentsIndexLoader {
 	public static final String COMPONENTS_RESOURCE_LOCATION = "META-INF/spring.components";

 	/**
-	 * System property that instructs Spring to ignore the components index, i.e.
+	 * System property that instructs Spring to ignore the index, i.e.
 	 * to always return {@code null} from {@link #loadIndex(ClassLoader)}.
 	 * <p>The default is "false", allowing for regular use of the index. Switching this
 	 * flag to {@code true} fulfills a corner case scenario when an index is partially
 	 * available for some libraries (or use cases) but couldn't be built for the whole
 	 * application. In this case, the application context fallbacks to a regular
-	 * classpath arrangement (i.e. as though no index were present at all).
+	 * classpath arrangement (i.e. as no index was present at all).
 	 */
 	public static final String IGNORE_INDEX = "spring.index.ignore";

@@ -46,7 +46,6 @@ import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.ApplicationListener;
-import org.springframework.context.ApplicationStartupAware;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.EmbeddedValueResolverAware;
 import org.springframework.context.EnvironmentAware;
@@ -693,7 +692,7 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 		beanFactory.ignoreDependencyInterface(ApplicationEventPublisherAware.class);
 		beanFactory.ignoreDependencyInterface(MessageSourceAware.class);
 		beanFactory.ignoreDependencyInterface(ApplicationContextAware.class);
-		beanFactory.ignoreDependencyInterface(ApplicationStartupAware.class);
+		beanFactory.ignoreDependencyInterface(ApplicationStartup.class);

 		// BeanFactory interface not registered as resolvable type in a plain factory.
 		// MessageSource registered (and found for autowiring) as a bean.
@@ -895,8 +894,8 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
 					beanFactory.getBean(CONVERSION_SERVICE_BEAN_NAME, ConversionService.class));
 		}

-		// Register a default embedded value resolver if no BeanFactoryPostProcessor
-		// (such as a PropertySourcesPlaceholderConfigurer bean) registered any before:
+		// Register a default embedded value resolver if no bean post-processor
+		// (such as a PropertyPlaceholderConfigurer bean) registered any before:
 		// at this point, primarily for resolution in annotation attribute values.
 		if (!beanFactory.hasEmbeddedValueResolver()) {
 			beanFactory.addEmbeddedValueResolver(strVal -> getEnvironment().resolvePlaceholders(strVal));
@@ -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.
@@ -57,18 +57,17 @@ public abstract class MessageSourceSupport {


 	/**
-	 * Set whether to always apply the {@code MessageFormat} rules, parsing even
-	 * messages without arguments.
-	 * <p>Default is {@code false}: Messages without arguments are by default
-	 * returned as-is, without parsing them through {@code MessageFormat}.
-	 * Set this to {@code true} to enforce {@code MessageFormat} for all messages,
-	 * expecting all message texts to be written with {@code MessageFormat} escaping.
-	 * <p>For example, {@code MessageFormat} expects a single quote to be escaped
-	 * as two adjacent single quotes ({@code "''"}). If your message texts are all
-	 * written with such escaping, even when not defining argument placeholders,
-	 * you need to set this flag to {@code true}. Otherwise, only message texts
-	 * with actual arguments are supposed to be written with {@code MessageFormat}
-	 * escaping.
+	 * Set whether to always apply the {@code MessageFormat} rules,
+	 * parsing even messages without arguments.
+	 * <p>Default is "false": Messages without arguments are by default
+	 * returned as-is, without parsing them through MessageFormat.
+	 * Set this to "true" to enforce MessageFormat for all messages,
+	 * expecting all message texts to be written with MessageFormat escaping.
+	 * <p>For example, MessageFormat expects a single quote to be escaped
+	 * as "''". If your message texts are all written with such escaping,
+	 * even when not defining argument placeholders, you need to set this
+	 * flag to "true". Else, only message texts with actual arguments
+	 * are supposed to be written with MessageFormat escaping.
 	 * @see java.text.MessageFormat
 	 */
 	public void setAlwaysUseMessageFormat(boolean alwaysUseMessageFormat) {
@@ -76,7 +75,7 @@ public abstract class MessageSourceSupport {
 	}

 	/**
-	 * Return whether to always apply the {@code MessageFormat} rules, parsing even
+	 * Return whether to always apply the MessageFormat rules, parsing even
 	 * messages without arguments.
 	 */
 	protected boolean isAlwaysUseMessageFormat() {
@@ -151,10 +150,10 @@ public abstract class MessageSourceSupport {
 	}

 	/**
-	 * Create a {@code MessageFormat} for the given message and Locale.
-	 * @param msg the message to create a {@code MessageFormat} for
-	 * @param locale the Locale to create a {@code MessageFormat} for
-	 * @return the {@code MessageFormat} instance
+	 * Create a MessageFormat for the given message and Locale.
+	 * @param msg the message to create a MessageFormat for
+	 * @param locale the Locale to create a MessageFormat for
+	 * @return the MessageFormat instance
 	 */
 	protected MessageFormat createMessageFormat(String msg, Locale locale) {
 		return new MessageFormat(msg, locale);
@@ -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.
@@ -26,44 +26,27 @@ import java.lang.annotation.Target;
 * Declares that a field or method parameter should be formatted as a date or time.
 *
 * <p>Supports formatting by style pattern, ISO date time pattern, or custom format pattern string.
- * Can be applied to {@link java.util.Date}, {@link java.util.Calendar}, {@link Long} (for
- * millisecond timestamps) as well as JSR-310 {@code java.time} value types.
+ * Can be applied to {@code java.util.Date}, {@code java.util.Calendar}, {@code Long} (for
+ * millisecond timestamps) as well as JSR-310 <code>java.time</code> and Joda-Time value types.
 *
- * <p>For style-based formatting, set the {@link #style} attribute to the desired style pattern code.
+ * <p>For style-based formatting, set the {@link #style} attribute to be the style pattern code.
 * The first character of the code is the date style, and the second character is the time style.
 * Specify a character of 'S' for short style, 'M' for medium, 'L' for long, and 'F' for full.
- * The date or time may be omitted by specifying the style character '-' &mdash; for example,
- * 'M-' specifies a medium format for the date with no time.
+ * A date or time may be omitted by specifying the style character '-'.
 *
- * <p>For ISO-based formatting, set the {@link #iso} attribute to the desired {@link ISO} format,
- * such as {@link ISO#DATE}.
- *
- * <p>For custom formatting, set the {@link #pattern} attribute to a date time pattern, such as
- * {@code "yyyy/MM/dd hh:mm:ss a"}.
+ * <p>For ISO-based formatting, set the {@link #iso} attribute to be the desired {@link ISO} format,
+ * such as {@link ISO#DATE}. For custom formatting, set the {@link #pattern} attribute to be the
+ * DateTime pattern, such as {@code yyyy/MM/dd hh:mm:ss a}.
 *
 * <p>Each attribute is mutually exclusive, so only set one attribute per annotation instance
- * (the one most convenient for your formatting needs).
- *
- * <ul>
- * <li>When the pattern attribute is specified, it takes precedence over both the style and ISO attribute.</li>
- * <li>When the {@link #iso} attribute is specified, it takes precedence over the style attribute.</li>
- * <li>When no annotation attributes are specified, the default format applied is style-based
- * with a style code of 'SS' (short date, short time).</li>
- * </ul>
- *
- * <h3>Time Zones</h3>
- * <p>Whenever the {@link #style} or {@link #pattern} attribute is used, the
- * {@linkplain java.util.TimeZone#getDefault() default time zone} of the JVM will
- * be used when formatting {@link java.util.Date} values. Whenever the {@link #iso}
- * attribute is used when formatting {@link java.util.Date} values, {@code UTC}
- * will be used as the time zone. The same time zone will be applied to any
- * {@linkplain #fallbackPatterns fallback patterns} as well. In order to enforce
- * consistent use of {@code UTC} as the time zone, you can bootstrap the JVM with
- * {@code -Duser.timezone=UTC}.
+ * (the one most convenient one for your formatting needs).
+ * When the pattern attribute is specified, it takes precedence over both the style and ISO attribute.
+ * When the {@link #iso} attribute is specified, it takes precedence over the style attribute.
+ * When no annotation attributes are specified, the default format applied is style-based
+ * with a style code of 'SS' (short date, short time).
 *
 * @author Keith Donald
 * @author Juergen Hoeller
- * @author Sam Brannen
 * @since 3.0
 * @see java.time.format.DateTimeFormatter
 * @see org.joda.time.format.DateTimeFormat
@@ -74,59 +57,34 @@ import java.lang.annotation.Target;
 public @interface DateTimeFormat {

 	/**
-	 * The style pattern to use to format the field or method parameter.
-	 * <p>Defaults to 'SS' for short date, short time. Set this attribute when you
-	 * wish to format your field or method parameter in accordance with a common
-	 * style other than the default style.
-	 * @see #fallbackPatterns
+	 * The style pattern to use to format the field.
+	 * <p>Defaults to 'SS' for short date time. Set this attribute when you wish to format
+	 * your field in accordance with a common style other than the default style.
 	 */
 	String style() default "SS";

 	/**
-	 * The ISO pattern to use to format the field or method parameter.
-	 * <p>Supported ISO patterns are defined in the {@link ISO} enum.
+	 * The ISO pattern to use to format the field.
+	 * <p>The possible ISO patterns are defined in the {@link ISO} enum.
 	 * <p>Defaults to {@link ISO#NONE}, indicating this attribute should be ignored.
-	 * Set this attribute when you wish to format your field or method parameter
-	 * in accordance with an ISO format.
-	 * @see #fallbackPatterns
+	 * Set this attribute when you wish to format your field in accordance with an ISO format.
 	 */
 	ISO iso() default ISO.NONE;

 	/**
-	 * The custom pattern to use to format the field or method parameter.
-	 * <p>Defaults to empty String, indicating no custom pattern String has been
-	 * specified. Set this attribute when you wish to format your field or method
-	 * parameter in accordance with a custom date time pattern not represented by
-	 * a style or ISO format.
+	 * The custom pattern to use to format the field.
+	 * <p>Defaults to empty String, indicating no custom pattern String has been specified.
+	 * Set this attribute when you wish to format your field in accordance with a custom
+	 * date time pattern not represented by a style or ISO format.
 	 * <p>Note: This pattern follows the original {@link java.text.SimpleDateFormat} style,
 	 * as also supported by Joda-Time, with strict parsing semantics towards overflows
 	 * (e.g. rejecting a Feb 29 value for a non-leap-year). As a consequence, 'yy'
 	 * characters indicate a year in the traditional style, not a "year-of-era" as in the
 	 * {@link java.time.format.DateTimeFormatter} specification (i.e. 'yy' turns into 'uu'
-	 * when going through a {@code DateTimeFormatter} with strict resolution mode).
-	 * @see #fallbackPatterns
+	 * when going through that {@code DateTimeFormatter} with strict resolution mode).
 	 */
 	String pattern() default "";

-	/**
-	 * The set of custom patterns to use as a fallback in case parsing fails for
-	 * the primary {@link #pattern}, {@link #iso}, or {@link #style} attribute.
-	 * <p>For example, if you wish to use the ISO date format for parsing and
-	 * printing but allow for lenient parsing of user input for various date
-	 * formats, you could configure something similar to the following.
-	 * <pre style="code">
-	 * {@literal @}DateTimeFormat(iso = ISO.DATE, fallbackPatterns = { "M/d/yy", "dd.MM.yyyy" })
-	 * </pre>
-	 * <p>Fallback patterns are only used for parsing. They are not used for
-	 * printing the value as a String. The primary {@link #pattern}, {@link #iso},
-	 * or {@link #style} attribute is always used for printing. For details on
-	 * which time zone is used for fallback patterns, see the
-	 * {@linkplain DateTimeFormat class-level documentation}.
-	 * <p>Fallback patterns are not supported for Joda-Time value types.
-	 * @since 5.3.5
-	 */
-	String[] fallbackPatterns() default {};
-

 	/**
 	 * Common ISO date time format patterns.
@@ -134,20 +92,20 @@ public @interface DateTimeFormat {
 	enum ISO {

 		/**
-		 * The most common ISO Date Format {@code yyyy-MM-dd} &mdash; for example,
-		 * "2000-10-31".
+		 * The most common ISO Date Format {@code yyyy-MM-dd},
+		 * e.g. "2000-10-31".
 		 */
 		DATE,

 		/**
-		 * The most common ISO Time Format {@code HH:mm:ss.SSSXXX} &mdash; for example,
-		 * "01:30:00.000-05:00".
+		 * The most common ISO Time Format {@code HH:mm:ss.SSSXXX},
+		 * e.g. "01:30:00.000-05:00".
 		 */
 		TIME,

 		/**
-		 * The most common ISO Date Time Format {@code yyyy-MM-dd'T'HH:mm:ss.SSSXXX}
-		 * &mdash; for example, "2000-10-31T01:30:00.000-05:00".
+		 * The most common ISO DateTime Format {@code yyyy-MM-dd'T'HH:mm:ss.SSSXXX},
+		 * e.g. "2000-10-31T01:30:00.000-05:00".
 		 */
 		DATE_TIME,

@@ -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.
@@ -27,21 +27,17 @@ import java.util.Map;
 import java.util.TimeZone;

 import org.springframework.format.Formatter;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat.ISO;
 import org.springframework.lang.Nullable;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;

 /**
 * A formatter for {@link java.util.Date} types.
- * <p>Supports the configuration of an explicit date time pattern, timezone,
- * locale, and fallback date time patterns for lenient parsing.
+ * Allows the configuration of an explicit date pattern and locale.
 *
 * @author Keith Donald
 * @author Juergen Hoeller
 * @author Phillip Webb
- * @author Sam Brannen
 * @since 3.0
 * @see SimpleDateFormat
 */
@@ -60,15 +56,9 @@ public class DateFormatter implements Formatter<Date> {
 	}


-	@Nullable
-	private Object source;
-
 	@Nullable
 	private String pattern;

-	@Nullable
-	private String[] fallbackPatterns;
-
 	private int style = DateFormat.DEFAULT;

 	@Nullable
@@ -84,33 +74,19 @@ public class DateFormatter implements Formatter<Date> {


 	/**
-	 * Create a new default {@code DateFormatter}.
+	 * Create a new default DateFormatter.
 	 */
 	public DateFormatter() {
 	}

 	/**
-	 * Create a new {@code DateFormatter} for the given date time pattern.
+	 * Create a new DateFormatter for the given date pattern.
 	 */
 	public DateFormatter(String pattern) {
 		this.pattern = pattern;
 	}


-	/**
-	 * Set the source of the configuration for this {@code DateFormatter} &mdash;
-	 * for example, an instance of the {@link DateTimeFormat @DateTimeFormat}
-	 * annotation if such an annotation was used to configure this {@code DateFormatter}.
-	 * <p>The supplied source object will only be used for descriptive purposes
-	 * by invoking its {@code toString()} method &mdash; for example, when
-	 * generating an exception message to provide further context.
-	 * @param source the source of the configuration
-	 * @since 5.3.5
-	 */
-	public void setSource(Object source) {
-		this.source = source;
-	}
-
 	/**
 	 * Set the pattern to use to format date values.
 	 * <p>If not specified, DateFormat's default style will be used.
@@ -120,19 +96,7 @@ public class DateFormatter implements Formatter<Date> {
 	}

 	/**
-	 * Set additional patterns to use as a fallback in case parsing fails for the
-	 * configured {@linkplain #setPattern pattern}, {@linkplain #setIso ISO format},
-	 * {@linkplain #setStyle style}, or {@linkplain #setStylePattern style pattern}.
-	 * @param fallbackPatterns the fallback parsing patterns
-	 * @since 5.3.5
-	 * @see DateTimeFormat#fallbackPatterns()
-	 */
-	public void setFallbackPatterns(String... fallbackPatterns) {
-		this.fallbackPatterns = fallbackPatterns;
-	}
-
-	/**
-	 * Set the ISO format to use to format date values.
+	 * Set the ISO format used for this date.
 	 * @param iso the {@link ISO} format
 	 * @since 3.2
 	 */
@@ -141,7 +105,7 @@ public class DateFormatter implements Formatter<Date> {
 	}

 	/**
-	 * Set the {@link DateFormat} style to use to format date values.
+	 * Set the style to use to format date values.
 	 * <p>If not specified, DateFormat's default style will be used.
 	 * @see DateFormat#DEFAULT
 	 * @see DateFormat#SHORT
@@ -154,10 +118,8 @@ public class DateFormatter implements Formatter<Date> {
 	}

 	/**
-	 * Set the two characters to use to format date values.
-	 * <p>The first character is used for the date style; the second is used for
-	 * the time style.
-	 * <p>Supported characters:
+	 * Set the two character to use to format date values. The first character used for
+	 * the date style, the second is for the time style. Supported characters are
 	 * <ul>
 	 * <li>'S' = Small</li>
 	 * <li>'M' = Medium</li>
@@ -174,7 +136,7 @@ public class DateFormatter implements Formatter<Date> {
 	}

 	/**
-	 * Set the {@link TimeZone} to normalize the date values into, if any.
+	 * Set the TimeZone to normalize the date values into, if any.
 	 */
 	public void setTimeZone(TimeZone timeZone) {
 		this.timeZone = timeZone;
@@ -197,45 +159,12 @@ public class DateFormatter implements Formatter<Date> {

 	@Override
 	public Date parse(String text, Locale locale) throws ParseException {
-		try {
-			return getDateFormat(locale).parse(text);
-		}
-		catch (ParseException ex) {
-			if (!ObjectUtils.isEmpty(this.fallbackPatterns)) {
-				for (String pattern : this.fallbackPatterns) {
-					try {
-						DateFormat dateFormat = configureDateFormat(new SimpleDateFormat(pattern, locale));
-						// Align timezone for parsing format with printing format if ISO is set.
-						if (this.iso != null && this.iso != ISO.NONE) {
-							dateFormat.setTimeZone(UTC);
-						}
-						return dateFormat.parse(text);
-					}
-					catch (ParseException ignoredException) {
-						// Ignore fallback parsing exceptions since the exception thrown below
-						// will include information from the "source" if available -- for example,
-						// the toString() of a @DateTimeFormat annotation.
-					}
-				}
-			}
-			if (this.source != null) {
-				ParseException parseException = new ParseException(
-					String.format("Unable to parse date time value \"%s\" using configuration from %s", text, this.source),
-					ex.getErrorOffset());
-				parseException.initCause(ex);
-				throw parseException;
-			}
-			// else rethrow original exception
-			throw ex;
-		}
+		return getDateFormat(locale).parse(text);
 	}


 	protected DateFormat getDateFormat(Locale locale) {
-		return configureDateFormat(createDateFormat(locale));
-	}
-
-	private DateFormat configureDateFormat(DateFormat dateFormat) {
+		DateFormat dateFormat = createDateFormat(locale);
 		if (this.timeZone != null) {
 			dateFormat.setTimeZone(this.timeZone);
 		}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,12 +16,10 @@

 package org.springframework.format.datetime;

-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;

 import org.springframework.context.support.EmbeddedValueResolutionSupport;
@@ -36,7 +34,6 @@ import org.springframework.util.StringUtils;
 * Formats fields annotated with the {@link DateTimeFormat} annotation using a {@link DateFormatter}.
 *
 * @author Phillip Webb
- * @author Sam Brannen
 * @since 3.2
 * @see org.springframework.format.datetime.joda.JodaDateTimeFormatAnnotationFormatterFactory
 */
@@ -71,30 +68,15 @@ public class DateTimeFormatAnnotationFormatterFactory  extends EmbeddedValueReso

 	protected Formatter<Date> getFormatter(DateTimeFormat annotation, Class<?> fieldType) {
 		DateFormatter formatter = new DateFormatter();
-		formatter.setSource(annotation);
-		formatter.setIso(annotation.iso());
-
 		String style = resolveEmbeddedValue(annotation.style());
 		if (StringUtils.hasLength(style)) {
 			formatter.setStylePattern(style);
 		}
-
+		formatter.setIso(annotation.iso());
 		String pattern = resolveEmbeddedValue(annotation.pattern());
 		if (StringUtils.hasLength(pattern)) {
 			formatter.setPattern(pattern);
 		}
-
-		List<String> resolvedFallbackPatterns = new ArrayList<>();
-		for (String fallbackPattern : annotation.fallbackPatterns()) {
-			String resolvedFallbackPattern = resolveEmbeddedValue(fallbackPattern);
-			if (StringUtils.hasLength(resolvedFallbackPattern)) {
-				resolvedFallbackPatterns.add(resolvedFallbackPattern);
-			}
-		}
-		if (!resolvedFallbackPatterns.isEmpty()) {
-			formatter.setFallbackPatterns(resolvedFallbackPatterns.toArray(new String[0]));
-		}
-
 		return formatter;
 	}

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import org.springframework.lang.Nullable;
 /**
 * A context that holds user-specific <code>java.time</code> (JSR-310) settings
 * such as the user's Chronology (calendar system) and time zone.
- * <p>A {@code null} property value indicates the user has not specified a setting.
+ * A {@code null} property value indicate the user has not specified a setting.
 *
 * @author Juergen Hoeller
 * @since 4.0
@@ -81,8 +81,8 @@ public class DateTimeContext {


 	/**
-	 * Get the DateTimeFormatter with this context's settings applied to the
-	 * base {@code formatter}.
+	 * Get the DateTimeFormatter with the this context's settings
+	 * applied to the base {@code formatter}.
 	 * @param formatter the base formatter that establishes default
 	 * formatting rules, generally context-independent
 	 * @return the contextual DateTimeFormatter
@@ -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.
@@ -69,8 +69,9 @@ public final class DateTimeContextHolder {
 		return dateTimeContextHolder.get();
 	}

+
 	/**
-	 * Obtain a DateTimeFormatter with user-specific settings applied to the given base formatter.
+	 * Obtain a DateTimeFormatter with user-specific settings applied to the given base Formatter.
 	 * @param formatter the base formatter that establishes default formatting rules
 	 * (generally user independent)
 	 * @param locale the current user locale (may be {@code null} if not known)
@@ -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.
@@ -18,6 +18,7 @@ package org.springframework.format.datetime.standard;

 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
+import java.time.format.ResolverStyle;
 import java.util.TimeZone;

 import org.springframework.format.annotation.DateTimeFormat.ISO;
@@ -33,7 +34,6 @@ import org.springframework.util.StringUtils;
 *
 * @author Juergen Hoeller
 * @author Phillip Webb
- * @author Sam Brannen
 * @since 4.0
 * @see #createDateTimeFormatter()
 * @see #createDateTimeFormatter(DateTimeFormatter)
@@ -180,7 +180,11 @@ public class DateTimeFormatterFactory {
 	public DateTimeFormatter createDateTimeFormatter(DateTimeFormatter fallbackFormatter) {
 		DateTimeFormatter dateTimeFormatter = null;
 		if (StringUtils.hasLength(this.pattern)) {
-			dateTimeFormatter = DateTimeFormatterUtils.createStrictDateTimeFormatter(this.pattern);
+			// Using strict parsing to align with Joda-Time and standard DateFormat behavior:
+			// otherwise, an overflow like e.g. Feb 29 for a non-leap-year wouldn't get rejected.
+			// However, with strict parsing, a year digit needs to be specified as 'u'...
+			String patternToUse = StringUtils.replace(this.pattern, "yy", "uu");
+			dateTimeFormatter = DateTimeFormatter.ofPattern(patternToUse).withResolverStyle(ResolverStyle.STRICT);
 		}
 		else if (this.iso != null && this.iso != ISO.NONE) {
 			switch (this.iso) {
@@ -1,40 +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.format.datetime.standard;
-
-import java.time.format.DateTimeFormatter;
-import java.time.format.ResolverStyle;
-
-import org.springframework.util.StringUtils;
-
-/**
- * Internal {@link DateTimeFormatter} utilities.
- *
- * @author Juergen Hoeller
- * @since 5.3.5
- */
-abstract class DateTimeFormatterUtils {
-
-	static DateTimeFormatter createStrictDateTimeFormatter(String pattern) {
-		// Using strict parsing to align with Joda-Time and standard DateFormat behavior:
-		// otherwise, an overflow like e.g. Feb 29 for a non-leap-year wouldn't get rejected.
-		// However, with strict parsing, a year digit needs to be specified as 'u'...
-		String patternToUse = StringUtils.replace(pattern, "yy", "uu");
-		return DateTimeFormatter.ofPattern(patternToUse).withResolverStyle(ResolverStyle.STRICT);
-	}
-
-}
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,10 +24,8 @@ import java.time.OffsetTime;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAccessor;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;

 import org.springframework.context.support.EmbeddedValueResolutionSupport;
@@ -42,7 +40,6 @@ import org.springframework.util.StringUtils;
 * JSR-310 <code>java.time</code> package in JDK 8.
 *
 * @author Juergen Hoeller
- * @author Sam Brannen
 * @since 4.0
 * @see org.springframework.format.annotation.DateTimeFormat
 */
@@ -96,17 +93,8 @@ public class Jsr310DateTimeFormatAnnotationFormatterFactory extends EmbeddedValu
 	@Override
 	@SuppressWarnings("unchecked")
 	public Parser<?> getParser(DateTimeFormat annotation, Class<?> fieldType) {
-		List<String> resolvedFallbackPatterns = new ArrayList<>();
-		for (String fallbackPattern : annotation.fallbackPatterns()) {
-			String resolvedFallbackPattern = resolveEmbeddedValue(fallbackPattern);
-			if (StringUtils.hasLength(resolvedFallbackPattern)) {
-				resolvedFallbackPatterns.add(resolvedFallbackPattern);
-			}
-		}
-
 		DateTimeFormatter formatter = getFormatter(annotation, fieldType);
-		return new TemporalAccessorParser((Class<? extends TemporalAccessor>) fieldType,
-				formatter, resolvedFallbackPatterns.toArray(new String[0]), annotation);
+		return new TemporalAccessorParser((Class<? extends TemporalAccessor>) fieldType, formatter);
 	}

 	/**
@@ -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.
@@ -24,20 +24,16 @@ import java.time.OffsetDateTime;
 import java.time.OffsetTime;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
 import java.time.temporal.TemporalAccessor;
 import java.util.Locale;

 import org.springframework.format.Parser;
-import org.springframework.lang.Nullable;
-import org.springframework.util.ObjectUtils;

 /**
 * {@link Parser} implementation for a JSR-310 {@link java.time.temporal.TemporalAccessor},
- * using a {@link java.time.format.DateTimeFormatter} (the contextual one, if available).
+ * using a {@link java.time.format.DateTimeFormatter}) (the contextual one, if available).
 *
 * @author Juergen Hoeller
- * @author Sam Brannen
 * @since 4.0
 * @see DateTimeContextHolder#getFormatter
 * @see java.time.LocalDate#parse(CharSequence, java.time.format.DateTimeFormatter)
@@ -53,12 +49,6 @@ public final class TemporalAccessorParser implements Parser<TemporalAccessor> {

 	private final DateTimeFormatter formatter;

-	@Nullable
-	private final String[] fallbackPatterns;
-
-	@Nullable
-	private final Object source;
-

 	/**
 	 * Create a new TemporalAccessorParser for the given TemporalAccessor type.
@@ -67,49 +57,14 @@ public final class TemporalAccessorParser implements Parser<TemporalAccessor> {
 	 * @param formatter the base DateTimeFormatter instance
 	 */
 	public TemporalAccessorParser(Class<? extends TemporalAccessor> temporalAccessorType, DateTimeFormatter formatter) {
-		this(temporalAccessorType, formatter, null, null);
-	}
-
-	TemporalAccessorParser(Class<? extends TemporalAccessor> temporalAccessorType, DateTimeFormatter formatter,
-		@Nullable String[] fallbackPatterns, @Nullable Object source) {
 		this.temporalAccessorType = temporalAccessorType;
 		this.formatter = formatter;
-		this.fallbackPatterns = fallbackPatterns;
-		this.source = source;
 	}


 	@Override
 	public TemporalAccessor parse(String text, Locale locale) throws ParseException {
-		try {
-			return doParse(text, locale, this.formatter);
-		}
-		catch (DateTimeParseException ex) {
-			if (!ObjectUtils.isEmpty(this.fallbackPatterns)) {
-				for (String pattern : this.fallbackPatterns) {
-					try {
-						DateTimeFormatter fallbackFormatter = DateTimeFormatterUtils.createStrictDateTimeFormatter(pattern);
-						return doParse(text, locale, fallbackFormatter);
-					}
-					catch (DateTimeParseException ignoredException) {
-						// Ignore fallback parsing exceptions since the exception thrown below
-						// will include information from the "source" if available -- for example,
-						// the toString() of a @DateTimeFormat annotation.
-					}
-				}
-			}
-			if (this.source != null) {
-				throw new DateTimeParseException(
-					String.format("Unable to parse date time value \"%s\" using configuration from %s", text, this.source),
-					text, ex.getErrorIndex(), ex);
-			}
-			// else rethrow original exception
-			throw ex;
-		}
-	}
-
-	private TemporalAccessor doParse(String text, Locale locale, DateTimeFormatter formatter) throws DateTimeParseException {
-		DateTimeFormatter formatterToUse = DateTimeContextHolder.getFormatter(formatter, locale);
+		DateTimeFormatter formatterToUse = DateTimeContextHolder.getFormatter(this.formatter, locale);
 		if (LocalDate.class == this.temporalAccessorType) {
 			return LocalDate.parse(text, formatterToUse);
 		}
@@ -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.
@@ -85,7 +85,7 @@ public @interface Scheduled {
 	 * trigger, primarily meant for externally specified values resolved by a
 	 * <code>${...}</code> placeholder.
 	 * @return an expression that can be parsed to a cron schedule
-	 * @see org.springframework.scheduling.support.CronExpression#parse(String)
+	 * @see org.springframework.scheduling.support.CronSequenceGenerator
 	 */
 	String cron() default "";

@@ -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.
@@ -358,9 +358,9 @@ public class ScheduledAnnotationBeanPostProcessor
 				AnnotationUtils.isCandidateClass(targetClass, Arrays.asList(Scheduled.class, Schedules.class))) {
 			Map<Method, Set<Scheduled>> annotatedMethods = MethodIntrospector.selectMethods(targetClass,
 					(MethodIntrospector.MetadataLookup<Set<Scheduled>>) method -> {
-						Set<Scheduled> scheduledAnnotations = AnnotatedElementUtils.getMergedRepeatableAnnotations(
+						Set<Scheduled> scheduledMethods = AnnotatedElementUtils.getMergedRepeatableAnnotations(
 								method, Scheduled.class, Schedules.class);
-						return (!scheduledAnnotations.isEmpty() ? scheduledAnnotations : null);
+						return (!scheduledMethods.isEmpty() ? scheduledMethods : null);
 					});
 			if (annotatedMethods.isEmpty()) {
 				this.nonAnnotatedClasses.add(targetClass);
@@ -370,8 +370,8 @@ public class ScheduledAnnotationBeanPostProcessor
 			}
 			else {
 				// Non-empty set of methods
-				annotatedMethods.forEach((method, scheduledAnnotations) ->
-						scheduledAnnotations.forEach(scheduled -> processScheduled(scheduled, method, bean)));
+				annotatedMethods.forEach((method, scheduledMethods) ->
+						scheduledMethods.forEach(scheduled -> processScheduled(scheduled, method, bean)));
 				if (logger.isTraceEnabled()) {
 					logger.trace(annotatedMethods.size() + " @Scheduled methods processed on bean '" + beanName +
 							"': " + annotatedMethods);
@@ -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.
@@ -177,8 +177,8 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 	 * Set up the ExecutorService.
 	 */
 	public void initialize() {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Initializing ExecutorService" + (this.beanName != null ? " '" + this.beanName + "'" : ""));
+		if (logger.isInfoEnabled()) {
+			logger.info("Initializing ExecutorService" + (this.beanName != null ? " '" + this.beanName + "'" : ""));
 		}
 		if (!this.threadNamePrefixSet && this.beanName != null) {
 			setThreadNamePrefix(this.beanName + "-");
@@ -214,8 +214,8 @@ public abstract class ExecutorConfigurationSupport extends CustomizableThreadFac
 	 * @see java.util.concurrent.ExecutorService#shutdownNow()
 	 */
 	public void shutdown() {
-		if (logger.isDebugEnabled()) {
-			logger.debug("Shutting down ExecutorService" + (this.beanName != null ? " '" + this.beanName + "'" : ""));
+		if (logger.isInfoEnabled()) {
+			logger.info("Shutting down ExecutorService" + (this.beanName != null ? " '" + this.beanName + "'" : ""));
 		}
 		if (this.executor != null) {
 			if (this.waitForTasksToCompleteOnShutdown) {
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@ import org.springframework.scheduling.support.CronTrigger;

 /**
 * {@link TriggerTask} implementation defining a {@code Runnable} to be executed according
- * to a {@linkplain org.springframework.scheduling.support.CronExpression#parse(String)
- * standard cron expression}.
+ * to a {@linkplain org.springframework.scheduling.support.CronSequenceGenerator standard
+ * cron expression}.
 *
 * @author Chris Beams
 * @since 3.2
@@ -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.
@@ -165,10 +165,6 @@ final class BitsCronField extends CronField {
 				int max = Integer.parseInt(value.substring(hyphenPos + 1));
 				min = type.checkValidValue(min);
 				max = type.checkValidValue(max);
-				if (type == Type.DAY_OF_WEEK && min == 7) {
-					// If used as a minimum in a range, Sunday means 0 (not 7)
-					min = 0;
-				}
 				return ValueRange.of(min, max);
 			}
 		}
@@ -192,11 +188,6 @@ final class BitsCronField extends CronField {
 			while (current != next && count++ < CronExpression.MAX_ATTEMPTS) {
 				temporal = type().elapseUntil(temporal, next);
 				current = type().get(temporal);
-				next = nextSetBit(current);
-				if (next == -1) {
-					temporal = type().rollForward(temporal);
-					next = nextSetBit(0);
-				}
 			}
 			if (count >= CronExpression.MAX_ATTEMPTS) {
 				return null;
@@ -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.
@@ -202,25 +202,6 @@ public final class CronExpression {
 		}
 	}

-	/**
-	 * Determine whether the given string represents a valid cron expression.
-	 * @param expression the expression to evaluate
-	 * @return {@code true} if the given expression is a valid cron expression
-	 * @since 5.3.8
-	 */
-	public static boolean isValidExpression(@Nullable String expression) {
-		if (expression == null) {
-			return false;
-		}
-		try {
-			parse(expression);
-			return true;
-		}
-		catch (IllegalArgumentException ex) {
-			return false;
-		}
-	}
-

 	private static String resolveMacros(String expression) {
 		expression = expression.trim();
@@ -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.
@@ -157,11 +157,6 @@ abstract class CronField {
 		return this.type;
 	}

-	@SuppressWarnings("unchecked")
-	protected static <T extends Temporal & Comparable<? super T>> T cast(Temporal temporal) {
-		return (T) temporal;
-	}
-

 	/**
 	 * Represents the type of cron field, i.e. seconds, minutes, hours,
@@ -241,17 +236,11 @@ abstract class CronField {
 		 */
 		public <T extends Temporal & Comparable<? super T>> T elapseUntil(T temporal, int goal) {
 			int current = get(temporal);
-			ValueRange range = temporal.range(this.field);
 			if (current < goal) {
-				if (range.isValidIntValue(goal)) {
-					return cast(temporal.with(this.field, goal));
-				}
-				else {
-					// goal is invalid, eg. 29th Feb, lets try to get as close as possible
-					return this.field.getBaseUnit().addTo(temporal, goal - current);
-				}
+				return this.field.getBaseUnit().addTo(temporal, goal - current);
 			}
 			else {
+				ValueRange range = temporal.range(this.field);
 				long amount = goal + range.getMaximum() - current + 1 - range.getMinimum();
 				return this.field.getBaseUnit().addTo(temporal, amount);
 			}
@@ -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.
@@ -326,6 +326,12 @@ final class QuartzCronField extends CronField {
 		}
 	}

+	@SuppressWarnings("unchecked")
+	private static <T extends Temporal & Comparable<? super T>> T cast(Temporal temporal) {
+		return (T) temporal;
+	}
+
+
 	@Override
 	public <T extends Temporal & Comparable<? super T>> T nextOrSame(T temporal) {
 		T result = adjust(temporal);
@@ -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.
@@ -66,8 +66,7 @@ public class ConcurrentModel extends ConcurrentHashMap<String, Object> implement


 	@Override
-	@Nullable
-	public Object put(String key, @Nullable Object value) {
+	public Object put(String key, Object value) {
 		if (value != null) {
 			return super.put(key, value);
 		}
@@ -1,70 +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.validation.annotation;
-
-import java.lang.annotation.Annotation;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.lang.Nullable;
-
-/**
- * Utility class for handling validation annotations.
- * Mainly for internal use within the framework.
- *
- * @author Christoph Dreis
- * @since 5.3.7
- */
-public abstract class ValidationAnnotationUtils {
-
-	private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
-
-	/**
-	 * Determine any validation hints by the given annotation.
-	 * <p>This implementation checks for {@code @javax.validation.Valid},
-	 * Spring's {@link org.springframework.validation.annotation.Validated},
-	 * and custom annotations whose name starts with "Valid".
-	 * @param ann the annotation (potentially a validation annotation)
-	 * @return the validation hints to apply (possibly an empty array),
-	 * or {@code null} if this annotation does not trigger any validation
-	 */
-	@Nullable
-	public static Object[] determineValidationHints(Annotation ann) {
-		Class<? extends Annotation> annotationType = ann.annotationType();
-		String annotationName = annotationType.getName();
-		if ("javax.validation.Valid".equals(annotationName)) {
-			return EMPTY_OBJECT_ARRAY;
-		}
-		Validated validatedAnn = AnnotationUtils.getAnnotation(ann, Validated.class);
-		if (validatedAnn != null) {
-			Object hints = validatedAnn.value();
-			return convertValidationHints(hints);
-		}
-		if (annotationType.getSimpleName().startsWith("Valid")) {
-			Object hints = AnnotationUtils.getValue(ann);
-			return convertValidationHints(hints);
-		}
-		return null;
-	}
-
-	private static Object[] convertValidationHints(@Nullable Object hints) {
-		if (hints == null) {
-			return EMPTY_OBJECT_ARRAY;
-		}
-		return (hints instanceof Object[] ? (Object[]) hints : new Object[]{hints});
-	}
-
-}
@@ -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.
@@ -18,7 +18,6 @@ package org.springframework.validation.support;

 import java.util.Map;

-import org.springframework.lang.Nullable;
 import org.springframework.ui.ConcurrentModel;
 import org.springframework.validation.BindingResult;

@@ -37,19 +36,17 @@ import org.springframework.validation.BindingResult;
 * @author Rossen Stoyanchev
 * @since 5.0
 * @see BindingResult
- * @see BindingAwareModelMap
 */
@SuppressWarnings("serial")
 public class BindingAwareConcurrentModel extends ConcurrentModel {

 	@Override
-	@Nullable
-	public Object put(String key, @Nullable Object value) {
+	public Object put(String key, Object value) {
 		removeBindingResultIfNecessary(key, value);
 		return super.put(key, value);
 	}

-	private void removeBindingResultIfNecessary(String key, @Nullable Object value) {
+	private void removeBindingResultIfNecessary(String key, Object value) {
 		if (!key.startsWith(BindingResult.MODEL_KEY_PREFIX)) {
 			String resultKey = BindingResult.MODEL_KEY_PREFIX + key;
 			BindingResult result = (BindingResult) get(resultKey);
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.springframework.validation.support;

 import java.util.Map;

-import org.springframework.lang.Nullable;
 import org.springframework.ui.ExtendedModelMap;
 import org.springframework.validation.BindingResult;

@@ -40,7 +39,7 @@ import org.springframework.validation.BindingResult;
 public class BindingAwareModelMap extends ExtendedModelMap {

 	@Override
-	public Object put(String key, @Nullable Object value) {
+	public Object put(String key, Object value) {
 		removeBindingResultIfNecessary(key, value);
 		return super.put(key, value);
 	}
@@ -51,7 +50,7 @@ public class BindingAwareModelMap extends ExtendedModelMap {
 		super.putAll(map);
 	}

-	private void removeBindingResultIfNecessary(Object key, @Nullable Object value) {
+	private void removeBindingResultIfNecessary(Object key, Object value) {
 		if (key instanceof String) {
 			String attributeName = (String) key;
 			if (!attributeName.startsWith(BindingResult.MODEL_KEY_PREFIX)) {
@@ -244,7 +244,7 @@
 		<xsd:attribute name="cron" type="xsd:string" use="optional">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-	A cron-based trigger. See the org.springframework.scheduling.support.CronExpression#parse
+	A cron-based trigger. See the org.springframework.scheduling.support.CronSequenceGenerator
 	JavaDoc for example patterns.
 				]]></xsd:documentation>
 			</xsd:annotation>
@@ -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,8 +19,6 @@ package org.springframework.cache.config;
 import org.junit.jupiter.api.Test;

 import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
@@ -89,7 +87,6 @@ public class EnableCachingTests extends AbstractCacheAnnotationTests {
 		}
 		catch (IllegalStateException ex) {
 			assertThat(ex.getMessage().contains("no unique bean of type CacheManager")).isTrue();
-			assertThat(ex).hasCauseInstanceOf(NoUniqueBeanDefinitionException.class);
 		}
 	}

@@ -124,7 +121,6 @@ public class EnableCachingTests extends AbstractCacheAnnotationTests {
 		}
 		catch (IllegalStateException ex) {
 			assertThat(ex.getMessage().contains("no bean of type CacheManager")).isTrue();
-			assertThat(ex).hasCauseInstanceOf(NoSuchBeanDefinitionException.class);
 		}
 	}

@@ -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.
@@ -111,12 +111,6 @@ public class AnnotationDrivenEventListenerTests {
 		this.context.publishEvent(event);
 		this.eventCollector.assertEvent(listener, event);
 		this.eventCollector.assertTotalEventsCount(1);
-
-		context.getBean(ApplicationEventMulticaster.class).removeApplicationListeners(l ->
-				l instanceof SmartApplicationListener && ((SmartApplicationListener) l).getListenerId().contains("TestEvent"));
-		this.eventCollector.clear();
-		this.context.publishEvent(event);
-		this.eventCollector.assertNoEventReceived(listener);
 	}

 	@Test
@@ -132,12 +126,6 @@ public class AnnotationDrivenEventListenerTests {
 		this.context.publishEvent(event);
 		this.eventCollector.assertEvent(listener, event);
 		this.eventCollector.assertTotalEventsCount(1);
-
-		context.getBean(ApplicationEventMulticaster.class).removeApplicationListeners(l ->
-				l instanceof SmartApplicationListener && ((SmartApplicationListener) l).getListenerId().contains("TestEvent"));
-		this.eventCollector.clear();
-		this.context.publishEvent(event);
-		this.eventCollector.assertNoEventReceived(listener);
 	}

 	@Test
@@ -150,12 +138,6 @@ public class AnnotationDrivenEventListenerTests {
 		this.context.publishEvent(event);
 		this.eventCollector.assertEvent(bean, event);
 		this.eventCollector.assertTotalEventsCount(1);
-
-		context.getBean(ApplicationEventMulticaster.class).removeApplicationListeners(l ->
-				l instanceof SmartApplicationListener && ((SmartApplicationListener) l).getListenerId().equals("foo"));
-		this.eventCollector.clear();
-		this.context.publishEvent(event);
-		this.eventCollector.assertNoEventReceived(bean);
 	}

 	@Test
@@ -729,7 +711,7 @@ public class AnnotationDrivenEventListenerTests {
 	}


-	@EventListener(id = "foo")
+	@EventListener
 	@Target(ElementType.METHOD)
 	@Retention(RetentionPolicy.RUNTIME)
 	@interface FooListener {
@@ -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.
@@ -16,7 +16,6 @@

 package org.springframework.format.datetime;

-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -26,23 +25,16 @@ import java.util.Locale;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;

 import org.springframework.beans.MutablePropertyValues;
-import org.springframework.beans.TypeMismatchException;
 import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat.ISO;
 import org.springframework.format.support.FormattingConversionService;
-import org.springframework.validation.BindingResult;
 import org.springframework.validation.DataBinder;
-import org.springframework.validation.FieldError;

 import static org.assertj.core.api.Assertions.assertThat;

@@ -50,11 +42,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 * @author Phillip Webb
 * @author Keith Donald
 * @author Juergen Hoeller
- * @author Sam Brannen
 */
 public class DateFormattingTests {

-	private final FormattingConversionService conversionService = new FormattingConversionService();
+	private FormattingConversionService conversionService;

 	private DataBinder binder;

@@ -66,6 +57,7 @@ public class DateFormattingTests {
 	}

 	private void setup(DateFormatterRegistrar registrar) {
+		conversionService = new FormattingConversionService();
 		DefaultConversionService.addDefaultConverters(conversionService);
 		registrar.registerFormatters(conversionService);

@@ -95,67 +87,34 @@ public class DateFormattingTests {
 	@Test
 	void testBindLongAnnotated() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("styleMillis", "10/31/09");
+		propertyValues.add("millisAnnotated", "10/31/09");
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("styleMillis")).isEqualTo("10/31/09");
+		assertThat(binder.getBindingResult().getFieldValue("millisAnnotated")).isEqualTo("10/31/09");
 	}

 	@Test
 	void testBindCalendarAnnotated() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("styleCalendar", "10/31/09");
+		propertyValues.add("calendarAnnotated", "10/31/09");
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("styleCalendar")).isEqualTo("10/31/09");
+		assertThat(binder.getBindingResult().getFieldValue("calendarAnnotated")).isEqualTo("10/31/09");
 	}

 	@Test
 	void testBindDateAnnotated() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("styleDate", "10/31/09");
+		propertyValues.add("dateAnnotated", "10/31/09");
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("styleDate")).isEqualTo("10/31/09");
-	}
-
-	@Test
-	void styleDateWithInvalidFormat() {
-		String propertyName = "styleDate";
-		String propertyValue = "99/01/01";
-		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add(propertyName, propertyValue);
-		binder.bind(propertyValues);
-		BindingResult bindingResult = binder.getBindingResult();
-		assertThat(bindingResult.getErrorCount()).isEqualTo(1);
-		FieldError fieldError = bindingResult.getFieldError(propertyName);
-		TypeMismatchException exception = fieldError.unwrap(TypeMismatchException.class);
-		assertThat(exception)
-			.hasMessageContaining("for property 'styleDate'")
-			.hasCauseInstanceOf(ConversionFailedException.class).getCause()
-				.hasMessageContaining("for value '99/01/01'")
-				.hasCauseInstanceOf(IllegalArgumentException.class).getCause()
-					.hasMessageContaining("Parse attempt failed for value [99/01/01]")
-					.hasCauseInstanceOf(ParseException.class).getCause()
-						// Unable to parse date time value "99/01/01" using configuration from
-						// @org.springframework.format.annotation.DateTimeFormat(pattern=, style=S-, iso=NONE, fallbackPatterns=[])
-						// We do not check "fallbackPatterns=[]", since the array representation in the toString()
-						// implementation for annotations changed from [] to {} in Java 9. In addition, strings
-						// are enclosed in double quotes beginning with Java 9. Thus, we cannot check directly
-						// for the presence of "style=S-".
-						.hasMessageContainingAll(
-							"Unable to parse date time value \"99/01/01\" using configuration from",
-							"@org.springframework.format.annotation.DateTimeFormat",
-							"style=", "S-", "iso=NONE")
-						.hasCauseInstanceOf(ParseException.class).getCause()
-							.hasMessageStartingWith("Unparseable date: \"99/01/01\"")
-							.hasNoCause();
+		assertThat(binder.getBindingResult().getFieldValue("dateAnnotated")).isEqualTo("10/31/09");
 	}

 	@Test
 	void testBindDateArray() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("styleDate", new String[]{"10/31/09 12:00 PM"});
+		propertyValues.add("dateAnnotated", new String[]{"10/31/09 12:00 PM"});
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
 	}
@@ -163,10 +122,10 @@ public class DateFormattingTests {
 	@Test
 	void testBindDateAnnotatedWithError() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("styleDate", "Oct X31, 2009");
+		propertyValues.add("dateAnnotated", "Oct X31, 2009");
 		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getFieldErrorCount("styleDate")).isEqualTo(1);
-		assertThat(binder.getBindingResult().getFieldValue("styleDate")).isEqualTo("Oct X31, 2009");
+		assertThat(binder.getBindingResult().getFieldErrorCount("dateAnnotated")).isEqualTo(1);
+		assertThat(binder.getBindingResult().getFieldValue("dateAnnotated")).isEqualTo("Oct X31, 2009");
 	}

 	@Test
@@ -174,19 +133,19 @@ public class DateFormattingTests {
 	void testBindDateAnnotatedWithFallbackError() {
 		// TODO This currently passes because of the Date(String) constructor fallback is used
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("styleDate", "Oct 031, 2009");
+		propertyValues.add("dateAnnotated", "Oct 031, 2009");
 		binder.bind(propertyValues);
-		assertThat(binder.getBindingResult().getFieldErrorCount("styleDate")).isEqualTo(1);
-		assertThat(binder.getBindingResult().getFieldValue("styleDate")).isEqualTo("Oct 031, 2009");
+		assertThat(binder.getBindingResult().getFieldErrorCount("dateAnnotated")).isEqualTo(1);
+		assertThat(binder.getBindingResult().getFieldValue("dateAnnotated")).isEqualTo("Oct 031, 2009");
 	}

 	@Test
 	void testBindDateAnnotatedPattern() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("patternDate", "10/31/09 1:05");
+		propertyValues.add("dateAnnotatedPattern", "10/31/09 1:05");
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("patternDate")).isEqualTo("10/31/09 1:05");
+		assertThat(binder.getBindingResult().getFieldValue("dateAnnotatedPattern")).isEqualTo("10/31/09 1:05");
 	}

 	@Test
@@ -197,17 +156,16 @@ public class DateFormattingTests {
 		registrar.setFormatter(dateFormatter);
 		setup(registrar);
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("patternDate", "10/31/09 1:05");
+		propertyValues.add("dateAnnotatedPattern", "10/31/09 1:05");
 		binder.bind(propertyValues);
-		BindingResult bindingResult = binder.getBindingResult();
-		assertThat(bindingResult.getErrorCount()).isEqualTo(0);
-		assertThat(bindingResult.getFieldValue("patternDate")).isEqualTo("10/31/09 1:05");
+		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
+		assertThat(binder.getBindingResult().getFieldValue("dateAnnotatedPattern")).isEqualTo("10/31/09 1:05");
 	}

 	@Test
 	void testBindDateTimeOverflow() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("patternDate", "02/29/09 12:00 PM");
+		propertyValues.add("dateAnnotatedPattern", "02/29/09 12:00 PM");
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(1);
 	}
@@ -242,10 +200,10 @@ public class DateFormattingTests {
 	@Test
 	void testBindNestedDateAnnotated() {
 		MutablePropertyValues propertyValues = new MutablePropertyValues();
-		propertyValues.add("children[0].styleDate", "10/31/09");
+		propertyValues.add("children[0].dateAnnotated", "10/31/09");
 		binder.bind(propertyValues);
 		assertThat(binder.getBindingResult().getErrorCount()).isEqualTo(0);
-		assertThat(binder.getBindingResult().getFieldValue("children[0].styleDate")).isEqualTo("10/31/09");
+		assertThat(binder.getBindingResult().getFieldValue("children[0].dateAnnotated")).isEqualTo("10/31/09");
 	}

 	@Test
@@ -289,130 +247,35 @@ public class DateFormattingTests {
 	}


-	@Nested
-	class FallbackPatternTests {
-
-		@ParameterizedTest(name = "input date: {0}")
-		@ValueSource(strings = {"2021-03-02", "2021.03.02", "20210302", "3/2/21"})
-		void styleCalendar(String propertyValue) {
-			String propertyName = "styleCalendarWithFallbackPatterns";
-			MutablePropertyValues propertyValues = new MutablePropertyValues();
-			propertyValues.add(propertyName, propertyValue);
-			binder.bind(propertyValues);
-			BindingResult bindingResult = binder.getBindingResult();
-			assertThat(bindingResult.getErrorCount()).isEqualTo(0);
-			assertThat(bindingResult.getFieldValue(propertyName)).isEqualTo("3/2/21");
-		}
-
-		@ParameterizedTest(name = "input date: {0}")
-		@ValueSource(strings = {"2021-03-02", "2021.03.02", "20210302", "3/2/21"})
-		void styleDate(String propertyValue) {
-			String propertyName = "styleDateWithFallbackPatterns";
-			MutablePropertyValues propertyValues = new MutablePropertyValues();
-			propertyValues.add(propertyName, propertyValue);
-			binder.bind(propertyValues);
-			BindingResult bindingResult = binder.getBindingResult();
-			assertThat(bindingResult.getErrorCount()).isEqualTo(0);
-			assertThat(bindingResult.getFieldValue(propertyName)).isEqualTo("3/2/21");
-		}
-
-		@ParameterizedTest(name = "input date: {0}")
-		@ValueSource(strings = {"2021-03-02", "2021.03.02", "20210302", "3/2/21"})
-		void patternDate(String propertyValue) {
-			String propertyName = "patternDateWithFallbackPatterns";
-			MutablePropertyValues propertyValues = new MutablePropertyValues();
-			propertyValues.add(propertyName, propertyValue);
-			binder.bind(propertyValues);
-			BindingResult bindingResult = binder.getBindingResult();
-			assertThat(bindingResult.getErrorCount()).isEqualTo(0);
-			assertThat(bindingResult.getFieldValue(propertyName)).isEqualTo("2021-03-02");
-		}
-
-		@ParameterizedTest(name = "input date: {0}")
-		@ValueSource(strings = {"2021-03-02", "2021.03.02", "20210302", "3/2/21"})
-		void isoDate(String propertyValue) {
-			String propertyName = "isoDateWithFallbackPatterns";
-			MutablePropertyValues propertyValues = new MutablePropertyValues();
-			propertyValues.add(propertyName, propertyValue);
-			binder.bind(propertyValues);
-			BindingResult bindingResult = binder.getBindingResult();
-			assertThat(bindingResult.getErrorCount()).isEqualTo(0);
-			assertThat(bindingResult.getFieldValue(propertyName)).isEqualTo("2021-03-02");
-		}
-
-		@Test
-		void patternDateWithUnsupportedPattern() {
-			String propertyValue = "210302";
-			String propertyName = "patternDateWithFallbackPatterns";
-			MutablePropertyValues propertyValues = new MutablePropertyValues();
-			propertyValues.add(propertyName, propertyValue);
-			binder.bind(propertyValues);
-			BindingResult bindingResult = binder.getBindingResult();
-			assertThat(bindingResult.getErrorCount()).isEqualTo(1);
-			FieldError fieldError = bindingResult.getFieldError(propertyName);
-			assertThat(fieldError.unwrap(TypeMismatchException.class))
-				.hasMessageContaining("for property 'patternDateWithFallbackPatterns'")
-				.hasCauseInstanceOf(ConversionFailedException.class).getCause()
-					.hasMessageContaining("for value '210302'")
-					.hasCauseInstanceOf(IllegalArgumentException.class).getCause()
-						.hasMessageContaining("Parse attempt failed for value [210302]")
-						.hasCauseInstanceOf(ParseException.class).getCause()
-							// Unable to parse date time value "210302" using configuration from
-							// @org.springframework.format.annotation.DateTimeFormat(
-							// pattern=yyyy-MM-dd, style=SS, iso=NONE, fallbackPatterns=[M/d/yy, yyyyMMdd, yyyy.MM.dd])
-							.hasMessageContainingAll(
-								"Unable to parse date time value \"210302\" using configuration from",
-								"@org.springframework.format.annotation.DateTimeFormat",
-								"yyyy-MM-dd", "M/d/yy", "yyyyMMdd", "yyyy.MM.dd")
-							.hasCauseInstanceOf(ParseException.class).getCause()
-								.hasMessageStartingWith("Unparseable date: \"210302\"")
-								.hasNoCause();
-		}
-	}
-
-
 	@SuppressWarnings("unused")
 	private static class SimpleDateBean {

 		private Long millis;

-		private Long styleMillis;
+		private Long millisAnnotated;

-		@DateTimeFormat(style = "S-")
-		private Calendar styleCalendar;
+		@DateTimeFormat(style="S-")
+		private Calendar calendarAnnotated;

-		@DateTimeFormat(style = "S-", fallbackPatterns = { "yyyy-MM-dd", "yyyyMMdd", "yyyy.MM.dd" })
-		private Calendar styleCalendarWithFallbackPatterns;
+		@DateTimeFormat(style="S-")
+		private Date dateAnnotated;

-		@DateTimeFormat(style = "S-")
-		private Date styleDate;
+		@DateTimeFormat(pattern="M/d/yy h:mm")
+		private Date dateAnnotatedPattern;

-		@DateTimeFormat(style = "S-", fallbackPatterns = { "yyyy-MM-dd", "yyyyMMdd", "yyyy.MM.dd" })
-		private Date styleDateWithFallbackPatterns;
-
-		@DateTimeFormat(pattern = "M/d/yy h:mm")
-		private Date patternDate;
-
-		@DateTimeFormat(pattern = "yyyy-MM-dd", fallbackPatterns = { "M/d/yy", "yyyyMMdd", "yyyy.MM.dd" })
-		private Date patternDateWithFallbackPatterns;
-
-		@DateTimeFormat(iso = ISO.DATE)
+		@DateTimeFormat(iso=ISO.DATE)
 		private Date isoDate;

-		@DateTimeFormat(iso = ISO.DATE, fallbackPatterns = { "M/d/yy", "yyyyMMdd", "yyyy.MM.dd" })
-		private Date isoDateWithFallbackPatterns;
-
-		@DateTimeFormat(iso = ISO.TIME)
+		@DateTimeFormat(iso=ISO.TIME)
 		private Date isoTime;

-		@DateTimeFormat(iso = ISO.DATE_TIME)
+		@DateTimeFormat(iso=ISO.DATE_TIME)
 		private Date isoDateTime;

 		private final List<SimpleDateBean> children = new ArrayList<>();

-
 		public Long getMillis() {
-			return this.millis;
+			return millis;
 		}

 		public void setMillis(Long millis) {
@@ -420,80 +283,48 @@ public class DateFormattingTests {
 		}

 		@DateTimeFormat(style="S-")
-		public Long getStyleMillis() {
-			return this.styleMillis;
+		public Long getMillisAnnotated() {
+			return millisAnnotated;
 		}

-		public void setStyleMillis(@DateTimeFormat(style="S-") Long styleMillis) {
-			this.styleMillis = styleMillis;
+		public void setMillisAnnotated(@DateTimeFormat(style="S-") Long millisAnnotated) {
+			this.millisAnnotated = millisAnnotated;
 		}

-		public Calendar getStyleCalendar() {
-			return this.styleCalendar;
+		public Calendar getCalendarAnnotated() {
+			return calendarAnnotated;
 		}

-		public void setStyleCalendar(Calendar styleCalendar) {
-			this.styleCalendar = styleCalendar;
+		public void setCalendarAnnotated(Calendar calendarAnnotated) {
+			this.calendarAnnotated = calendarAnnotated;
 		}

-		public Calendar getStyleCalendarWithFallbackPatterns() {
-			return this.styleCalendarWithFallbackPatterns;
+		public Date getDateAnnotated() {
+			return dateAnnotated;
 		}

-		public void setStyleCalendarWithFallbackPatterns(Calendar styleCalendarWithFallbackPatterns) {
-			this.styleCalendarWithFallbackPatterns = styleCalendarWithFallbackPatterns;
+		public void setDateAnnotated(Date dateAnnotated) {
+			this.dateAnnotated = dateAnnotated;
 		}

-		public Date getStyleDate() {
-			return this.styleDate;
+		public Date getDateAnnotatedPattern() {
+			return dateAnnotatedPattern;
 		}

-		public void setStyleDate(Date styleDate) {
-			this.styleDate = styleDate;
-		}
-
-		public Date getStyleDateWithFallbackPatterns() {
-			return this.styleDateWithFallbackPatterns;
-		}
-
-		public void setStyleDateWithFallbackPatterns(Date styleDateWithFallbackPatterns) {
-			this.styleDateWithFallbackPatterns = styleDateWithFallbackPatterns;
-		}
-
-		public Date getPatternDate() {
-			return this.patternDate;
-		}
-
-		public void setPatternDate(Date patternDate) {
-			this.patternDate = patternDate;
-		}
-
-		public Date getPatternDateWithFallbackPatterns() {
-			return this.patternDateWithFallbackPatterns;
-		}
-
-		public void setPatternDateWithFallbackPatterns(Date patternDateWithFallbackPatterns) {
-			this.patternDateWithFallbackPatterns = patternDateWithFallbackPatterns;
+		public void setDateAnnotatedPattern(Date dateAnnotatedPattern) {
+			this.dateAnnotatedPattern = dateAnnotatedPattern;
 		}

 		public Date getIsoDate() {
-			return this.isoDate;
+			return isoDate;
 		}

 		public void setIsoDate(Date isoDate) {
 			this.isoDate = isoDate;
 		}

-		public Date getIsoDateWithFallbackPatterns() {
-			return this.isoDateWithFallbackPatterns;
-		}
-
-		public void setIsoDateWithFallbackPatterns(Date isoDateWithFallbackPatterns) {
-			this.isoDateWithFallbackPatterns = isoDateWithFallbackPatterns;
-		}
-
 		public Date getIsoTime() {
-			return this.isoTime;
+			return isoTime;
 		}

 		public void setIsoTime(Date isoTime) {
@@ -501,7 +332,7 @@ public class DateFormattingTests {
 		}

 		public Date getIsoDateTime() {
-			return this.isoDateTime;
+			return isoDateTime;
 		}

 		public void setIsoDateTime(Date isoDateTime) {
@@ -509,7 +340,7 @@ public class DateFormattingTests {
 		}

 		public List<SimpleDateBean> getChildren() {
-			return this.children;
+			return children;
 		}
 	}

--- a/Show More
+++ b/Show More